From: Sukrit Bhatnagar <skrtbhtngr@gmail.com>
Date: Sat, 28 Jul 2018 18:01:45 +0000 (+0530)
Subject: util: process: use VIR_AUTOPTR for aggregate types
X-Git-Tag: v4.7.0-rc1~289
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3a2e274c73d82bc429320edf1c8676e2dc51139;p=thirdparty%2Flibvirt.git

util: process: use VIR_AUTOPTR for aggregate types

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@gmail.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
---

diff --git a/src/util/virprocess.c b/src/util/virprocess.c
index 1db04cc214..ecea27a2d4 100644
--- a/src/util/virprocess.c
+++ b/src/util/virprocess.c
@@ -971,17 +971,16 @@ int virProcessGetStartTime(pid_t pid,
                            unsigned long long *timestamp)
 {
     char *tmp;
-    int ret = -1;
     int len;
-    char **tokens = NULL;
     VIR_AUTOFREE(char *) filename = NULL;
     VIR_AUTOFREE(char *) buf = NULL;
+    VIR_AUTOPTR(virString) tokens = NULL;
 
     if (virAsprintf(&filename, "/proc/%llu/stat", (long long) pid) < 0)
         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,