[PATCH v2 33/35] util: process: use VIR_AUTOPTR for aggregate types

[Sukrit Bhatnagar <skrtbhtngr@xxxxxxxxx>]

By making use of GNU C's cleanup attribute handled by the
VIR_AUTOPTR macro for declaring aggregate pointer variables,
majority of the calls to *Free functions can be dropped, which
in turn leads to getting rid of most of our cleanup sections.

Signed-off-by: Sukrit Bhatnagar <skrtbhtngr@xxxxxxxxx>
Reviewed-by: Erik Skultety <eskultet@xxxxxxxxxx>
---
 src/util/virprocess.c | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/util/virprocess.c b/src/util/virprocess.c
index 215e05d..1fbbe0c 100644
--- a/src/util/virprocess.c
+++ b/src/util/virprocess.c
@@ -971,9 +971,8 @@ int virProcessGetStartTime(pid_t pid,
                            unsigned long long *timestamp)
 {
     char *tmp;
-    int ret = -1;
     int len;
-    char **tokens = NULL;
+    VIR_AUTOPTR(virString) tokens = NULL;
     VIR_AUTOFREE(char *) filename = NULL;
     VIR_AUTOFREE(char *) buf = NULL;
 
@@ -981,7 +980,7 @@ int virProcessGetStartTime(pid_t pid,
         return -1;
 
     if ((len = virFileReadAll(filename, 1024, &buf)) < 0)
-        goto cleanup;
+        return -1;
 
     /* start time is the token at index 19 after the '(process name)' entry - since only this
      * field can contain the ')' character, search backwards for this to avoid malicious
@@ -992,14 +991,14 @@ int virProcessGetStartTime(pid_t pid,
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("Cannot find start time in %s"),
                        filename);
-        goto cleanup;
+        return -1;
     }
     tmp += 2; /* skip ') ' */
     if ((tmp - buf) >= len) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("Cannot find start time in %s"),
                        filename);
-        goto cleanup;
+        return -1;
     }
 
     tokens = virStringSplit(tmp, " ", 0);
@@ -1008,7 +1007,7 @@ int virProcessGetStartTime(pid_t pid,
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("Cannot find start time in %s"),
                        filename);
-        goto cleanup;
+        return -1;
     }
 
     if (virStrToLong_ull(tokens[19],
@@ -1018,14 +1017,10 @@ int virProcessGetStartTime(pid_t pid,
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("Cannot parse start time %s in %s"),
                        tokens[19], filename);
-        goto cleanup;
+        return -1;
     }
 
-    ret = 0;
-
- cleanup:
-    virStringListFree(tokens);
-    return ret;
+    return 0;
 }
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 int virProcessGetStartTime(pid_t pid,
-- 
1.8.3.1

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list