[v3] use GNU C's cleanup attribute in src/util (batch I)

[libvirt] [PATCH v3 11/35] util: command: use VIR_AUTOPTR for aggregate types

Posted by Sukrit Bhatnagar 6 years, 10 months ago

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>
---
 src/util/vircommand.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/util/vircommand.c b/src/util/vircommand.c
index d328431..6edb4d5 100644
--- a/src/util/vircommand.c
+++ b/src/util/vircommand.c
@@ -823,10 +823,9 @@ int
 virRun(const char *const*argv, int *status)
 {
     int ret;
-    virCommandPtr cmd = virCommandNewArgs(argv);
+    VIR_AUTOPTR(virCommand) cmd = virCommandNewArgs(argv);
 
     ret = virCommandRun(cmd, status);
-    virCommandFree(cmd);
     return ret;
 }
 
@@ -2960,7 +2959,7 @@ virCommandRunRegex(virCommandPtr cmd,
     int totgroups = 0, ngroup = 0, maxvars = 0;
     char **groups;
     VIR_AUTOFREE(char *) outbuf = NULL;
-    char **lines = NULL;
+    VIR_AUTOPTR(virString) lines = NULL;
     int ret = -1;
 
     /* Compile all regular expressions */
@@ -3039,7 +3038,6 @@ virCommandRunRegex(virCommandPtr cmd,
 
     ret = 0;
  cleanup:
-    virStringListFree(lines);
     if (groups) {
         for (j = 0; j < totgroups; j++)
             VIR_FREE(groups[j]);
-- 
1.8.3.1

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

Re: [libvirt] [PATCH v3 11/35] util: command: use VIR_AUTOPTR for aggregate types

Posted by Erik Skultety 6 years, 10 months ago

On Sat, Jun 30, 2018 at 02:30:15PM +0530, Sukrit Bhatnagar wrote:
> 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>
> ---
>  src/util/vircommand.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/src/util/vircommand.c b/src/util/vircommand.c
> index d328431..6edb4d5 100644
> --- a/src/util/vircommand.c
> +++ b/src/util/vircommand.c
> @@ -823,10 +823,9 @@ int
>  virRun(const char *const*argv, int *status)
>  {
>      int ret;
> -    virCommandPtr cmd = virCommandNewArgs(argv);
> +    VIR_AUTOPTR(virCommand) cmd = virCommandNewArgs(argv);
>
>      ret = virCommandRun(cmd, status);
> -    virCommandFree(cmd);

You can return virCommandRun directly.

>      return ret;

With that:
Reviewed-by: Erik Skultety <eskultet@redhat.com>

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