[NetworkManager-libreswan/lr/gtk-4.0: 4/15] shared: avoid unnecessary use of g_steal_pointer()
- From: Lubomir Rintel <lkundrak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [NetworkManager-libreswan/lr/gtk-4.0: 4/15] shared: avoid unnecessary use of g_steal_pointer()
- Date: Fri, 11 Mar 2022 08:15:00 +0000 (UTC)
commit d62116d6ff2b3dfa90b7df2eb4d4a6063b35005d
Author: Lubomir Rintel <lkundrak v3 sk>
Date: Fri Jan 14 18:13:30 2022 +0100
shared: avoid unnecessary use of g_steal_pointer()
This is only available in GLib 2.44, which we don't have.
Moreover, it's kinda useless here.
shared/utils.c | 46 +++++++++++++++++++++++-----------------------
1 file changed, 23 insertions(+), 23 deletions(-)
---
diff --git a/shared/utils.c b/shared/utils.c
index acb237f..338b009 100644
--- a/shared/utils.c
+++ b/shared/utils.c
@@ -370,7 +370,7 @@ void
nm_libreswan_detect_version (const char *path, gboolean *out_is_openswan, int *out_version, char
**out_banner)
{
const char *argv[] = { path, "--version", NULL };
- gs_free char *output = NULL;
+ char *output = NULL;
const char* v;
g_return_if_fail (out_is_openswan);
@@ -383,6 +383,8 @@ nm_libreswan_detect_version (const char *path, gboolean *out_is_openswan, int *o
return;
g_spawn_sync (NULL, (char **) argv, NULL, 0, NULL, NULL, &output, NULL, NULL, NULL);
+ if (!output)
+ return;
/*
* Examples:
@@ -391,29 +393,27 @@ nm_libreswan_detect_version (const char *path, gboolean *out_is_openswan, int *o
* Linux Libreswan U4.2rc1/K(no kernel code presently loaded) on 5.6.15-300.fc32.x86_64
*/
- if (output) {
- v = strcasestr (output, "Openswan");
- if (v) {
- v = v + strlen ("Openswan");
- *out_is_openswan = TRUE;
- }
-
- if (!v) {
- v = strcasestr (output, "Libreswan");
- if (v)
- v = v + strlen ("Libreswan");
- }
+ v = strcasestr (output, "Openswan");
+ if (v) {
+ v = v + strlen ("Openswan");
+ *out_is_openswan = TRUE;
+ }
- if (v) {
- while (g_ascii_isspace (*v))
- v++;
- if (*v == 'U')
- v++;
- if (g_ascii_isdigit (*v))
- *out_version = *v - '0';
- }
+ if (!v) {
+ v = strcasestr (output, "Libreswan");
+ if (v)
+ v = v + strlen ("Libreswan");
+ }
- if (out_banner)
- *out_banner = g_steal_pointer (&output);
+ if (v) {
+ while (g_ascii_isspace (*v))
+ v++;
+ if (*v == 'U')
+ v++;
+ if (g_ascii_isdigit (*v))
+ *out_version = *v - '0';
}
+
+ if (out_banner)
+ *out_banner = output;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]