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>

4 files changed, 5 insertions, 19 deletions

diff --git a/echld/child.c b/echld/child.c
index 3fe219a227..1441be0b20 100644
--- a/echld/child.c
+++ b/echld/child.c
@@ -276,7 +276,6 @@ static char* param_get_file_list(char** err) {
 	GError* gerror  = NULL;
 	GDir* dir = g_dir_open(".", 0, &gerror);
 	GString* str = g_string_new("{ what='file_list', files=[");
-	char* s;
 	const char* file;
 
 	if (gerror) {
@@ -292,9 +291,7 @@ static char* param_get_file_list(char** err) {
 	g_string_truncate(str, str->len-2); /* ',\n' */
 	g_string_append(str, "]}");
 
-	s=str->str;
-	g_string_free(str,FALSE);
-	return s;
+	return g_string_free(str,FALSE);
 }
 
 #ifdef PCAP_NG_DEFAULT
diff --git a/echld/common.c b/echld/common.c
index dbc7924f99..5e9687ca14 100644
--- a/echld/common.c
+++ b/echld/common.c
@@ -411,7 +411,6 @@ echld_bool_t paramset_apply_em(param_t* paramset, enc_msg_t* em, char** err) {
 char* paramset_get_params_list(param_t* paramsets,const char* fmt) {
 	param_t* p = paramsets;
 	GString* str = g_string_new("");
-	char* s;
 
 	for (;p->name;p++) {
 		g_string_append_printf(str,fmt,
@@ -420,9 +419,7 @@ char* paramset_get_params_list(param_t* paramsets,const char* fmt) {
 			p->desc);
 	}
 
-	s = str->str;
-	g_string_free(str,FALSE);
-	return s;
+	return g_string_free(str,FALSE);
 }
 
 
diff --git a/echld/dispatcher.c b/echld/dispatcher.c
index 20e59753f6..b18261b701 100644
--- a/echld/dispatcher.c
+++ b/echld/dispatcher.c
@@ -207,7 +207,6 @@ static char* intflist2json(GList* if_list, char** if_cap_err) {
     if_capabilities_t *caps;
     char        addr_str[ADDRSTRLEN];
     GString     *str = g_string_new("{ what='interfaces', interfaces={ \n");
-    char* s;
 
     for (if_entry = g_list_first(if_list); if_entry != NULL;
          if_entry = g_list_next(if_entry)) {
@@ -315,9 +314,7 @@ static char* intflist2json(GList* if_list, char** if_cap_err) {
     g_string_truncate(str,str->len - 2); /* the comma and return */
     g_string_append(str,"}");
 
-    s=str->str;
-    g_string_free(str,FALSE);
-    return s;
+    return g_string_free(str,FALSE);
 }
 
 static char* intf_list = NULL;
@@ -382,7 +379,6 @@ static char* param_get_version(char** err _U_) {
 
 static char* param_get_capture_types(char** err _U_) {
   GString* str = g_string_new("");
-  char* s;
   int i;
 
   for (i = 0; i < WTAP_NUM_FILE_TYPES_SUBTYPES; i++) {
@@ -392,9 +388,7 @@ static char* param_get_capture_types(char** err _U_) {
     }
   }
 
-  s = str->str;
-  g_string_free(str,FALSE);
-  return s;
+  return g_string_free(str,FALSE);
 }
 
 static echld_bool_t param_set_add_hosts_file(char* val, char** err) {
diff --git a/echld/parent.c b/echld/parent.c
index 071fb0c480..267ca0fb1f 100644
--- a/echld/parent.c
+++ b/echld/parent.c
@@ -915,9 +915,7 @@ char* echld_new_child_params_str(enc_msg_t* em, const char* prefix, const char*
 	}
 	g_string_truncate(str, str->len - trunc_n);
 	g_string_append(str,postfix);
-	p = str->str;
-	g_string_free(str,FALSE);
-	return p;
+	return g_string_free(str,FALSE);
 }
 
 void echld_new_child_params_add_params(enc_msg_t* em, ...) {