Consistently use the "g_string_free returns a C string pointer" idiom.

g_string_free(str, FALSE) frees the GString container but not the
underlying g_malloc()ed string; instead, it returns a pointer to the
g_malloc()ed string.

Fix those places that didn't already get the string pointer from
g_string_free() to do so rather than manually extracting the string
themselves.

And fix one place that didn't even need to use a string - it was just
scanning a C string without even modifying it.

Change-Id: Ibbf4872bf5b9935b9907f539b6edb1013f3053a5
Reviewed-on: https://code.wireshark.org/review/6532
Reviewed-by: Guy Harris <guy@alum.mit.edu>

1 files changed, 1 insertions, 4 deletions

diff --git a/epan/dissectors/packet-xml.c b/epan/dissectors/packet-xml.c
index b419d24ba7..c54553a891 100644
--- a/epan/dissectors/packet-xml.c
+++ b/epan/dissectors/packet-xml.c
@@ -922,7 +922,6 @@ static gchar *fully_qualified_name(GPtrArray *hier, gchar *name, gchar *proto_na
 {
     guint    i;
     GString *s = g_string_new(proto_name);
-    gchar   *str;
 
     g_string_append(s, ".");
 
@@ -931,10 +930,8 @@ static gchar *fully_qualified_name(GPtrArray *hier, gchar *name, gchar *proto_na
     }
 
     g_string_append(s, name);
-    str = s->str;
-    g_string_free(s, FALSE);
 
-    return str;
+    return g_string_free(s, FALSE);
 }