aboutsummaryrefslogtreecommitdiffstats
path: root/echld_test.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2015-01-13 15:13:40 -0800
committerGuy Harris <guy@alum.mit.edu>2015-01-13 23:14:13 +0000
commit63a3d043e3f14eebb0798a250d9aecdc8e89dfb9 (patch)
tree69a58dd4cadfc7f98669cba229e76fa8c60e0761 /echld_test.c
parent9f5e4fb7a51741a286ce5bc92a6f335ed58587a2 (diff)
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>
Diffstat (limited to 'echld_test.c')
-rw-r--r--echld_test.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/echld_test.c b/echld_test.c
index 5ac9f5fd82..fff59dfc89 100644
--- a/echld_test.c
+++ b/echld_test.c
@@ -317,14 +317,11 @@ cmd_t commands[] = {
static char* help_cmd(char** params _U_, char** err _U_) {
GString* out = g_string_new("Commands:\n");
cmd_t* c = commands;
- char* s;
for (;c->txt;c++) {
g_string_append_printf(out,"%s\n",c->help);
}
- s = out->str;
- g_string_free(out,FALSE);
- return s;
+ return g_string_free(out,FALSE);
}