[network-manager-openvpn: 6/10] properties: return-early from handle_num_seconds_item()



commit 0e5dbbd090e533df3eaea41f0aef56924d47429d
Author: Thomas Haller <thaller redhat com>
Date:   Fri Jan 22 14:25:35 2016 +0100

    properties: return-early from handle_num_seconds_item()

 properties/import-export.c |   34 ++++++++++++++++------------------
 1 files changed, 16 insertions(+), 18 deletions(-)
---
diff --git a/properties/import-export.c b/properties/import-export.c
index 88e3de4..6bb8f09 100644
--- a/properties/import-export.c
+++ b/properties/import-export.c
@@ -466,28 +466,26 @@ handle_num_seconds_item (const char *line,
 {
        char **items = NULL;
        int nitems;
+       int seconds;
 
-       if (!strncmp (line, tag, strlen (tag))) {
-               int seconds;
-
-               items = get_args (line + strlen (tag), &nitems);
-               if (nitems == 1) {
-                       seconds = parse_seconds (items[0], line);
-                       if (seconds >= 0) {
-                               char *tmp;
+       if (strncmp (line, tag, strlen (tag)))
+               return FALSE;
 
-                               tmp = g_strdup_printf ("%d", seconds);
-                               nm_setting_vpn_add_data_item (s_vpn, key, tmp);
-                               g_free (tmp);
-                       }
-               } else
-                       g_warning ("%s: invalid number of arguments in option '%s', must be one integer", 
__func__, line);
+       items = get_args (line + strlen (tag), &nitems);
+       if (nitems == 1) {
+               seconds = parse_seconds (items[0], line);
+               if (seconds >= 0) {
+                       char *tmp;
 
-               g_strfreev (items);
-               return TRUE;
-       }
+                       tmp = g_strdup_printf ("%d", seconds);
+                       nm_setting_vpn_add_data_item (s_vpn, key, tmp);
+                       g_free (tmp);
+               }
+       } else
+               g_warning ("%s: invalid number of arguments in option '%s', must be one integer", __func__, 
line);
 
-       return FALSE;
+       g_strfreev (items);
+       return TRUE;
 }
 
 static gboolean


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]