diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-01-13 15:13:40 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-01-13 23:14:13 +0000 |
| commit | 63a3d043e3f14eebb0798a250d9aecdc8e89dfb9 (patch) | |
| tree | 69a58dd4cadfc7f98669cba229e76fa8c60e0761 /echld/common.c | |
| parent | 9f5e4fb7a51741a286ce5bc92a6f335ed58587a2 (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/common.c')
| -rw-r--r-- | echld/common.c | 5 |
1 files changed, 1 insertions, 4 deletions
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); } |