simple cleanups in spapr files

[PATCH 04/14] hw/ppc/spapr_caps.c: use g_autofree in spapr_cap_get_string()

Posted by Daniel Henrique Barboza 3 years, 11 months ago

Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
 hw/ppc/spapr_caps.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c
index aab313ffb1..2773f9db9e 100644
--- a/hw/ppc/spapr_caps.c
+++ b/hw/ppc/spapr_caps.c
@@ -95,12 +95,12 @@ static void spapr_cap_set_bool(Object *obj, Visitor *v, const char *name,
 }
 
 
-static void  spapr_cap_get_string(Object *obj, Visitor *v, const char *name,
-                                  void *opaque, Error **errp)
+static void spapr_cap_get_string(Object *obj, Visitor *v, const char *name,
+                                 void *opaque, Error **errp)
 {
     SpaprCapabilityInfo *cap = opaque;
     SpaprMachineState *spapr = SPAPR_MACHINE(obj);
-    char *val = NULL;
+    g_autofree char *val = NULL;
     uint8_t value = spapr_get_cap(spapr, cap->index);
 
     if (value >= cap->possible->num) {
@@ -111,7 +111,6 @@ static void  spapr_cap_get_string(Object *obj, Visitor *v, const char *name,
     val = g_strdup(cap->possible->vals[value]);
 
     visit_type_str(v, name, &val, errp);
-    g_free(val);
 }
 
 static void spapr_cap_set_string(Object *obj, Visitor *v, const char *name,
-- 
2.35.1

Re: [PATCH 04/14] hw/ppc/spapr_caps.c: use g_autofree in spapr_cap_get_string()

Posted by David Gibson 3 years, 11 months ago

On Mon, Feb 28, 2022 at 02:49:54PM -0300, Daniel Henrique Barboza wrote:
> Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>

> ---
>  hw/ppc/spapr_caps.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c
> index aab313ffb1..2773f9db9e 100644
> --- a/hw/ppc/spapr_caps.c
> +++ b/hw/ppc/spapr_caps.c
> @@ -95,12 +95,12 @@ static void spapr_cap_set_bool(Object *obj, Visitor *v, const char *name,
>  }
>  
>  
> -static void  spapr_cap_get_string(Object *obj, Visitor *v, const char *name,
> -                                  void *opaque, Error **errp)
> +static void spapr_cap_get_string(Object *obj, Visitor *v, const char *name,
> +                                 void *opaque, Error **errp)
>  {
>      SpaprCapabilityInfo *cap = opaque;
>      SpaprMachineState *spapr = SPAPR_MACHINE(obj);
> -    char *val = NULL;
> +    g_autofree char *val = NULL;
>      uint8_t value = spapr_get_cap(spapr, cap->index);
>  
>      if (value >= cap->possible->num) {
> @@ -111,7 +111,6 @@ static void  spapr_cap_get_string(Object *obj, Visitor *v, const char *name,
>      val = g_strdup(cap->possible->vals[value]);
>  
>      visit_type_str(v, name, &val, errp);
> -    g_free(val);
>  }
>  
>  static void spapr_cap_set_string(Object *obj, Visitor *v, const char *name,

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson