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 /epan/oids.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 'epan/oids.c')
| -rw-r--r-- | epan/oids.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/epan/oids.c b/epan/oids.c index 2e5ec06447..2437a46a00 100644 --- a/epan/oids.c +++ b/epan/oids.c @@ -1219,7 +1219,6 @@ extern gchar * oid_get_default_mib_path(void) { #ifdef HAVE_LIBSMI GString* path_str; - gchar *path_ret; char *path; guint i; @@ -1256,9 +1255,7 @@ oid_get_default_mib_path(void) { g_string_append_printf(path_str,PATH_SEPARATOR "%s",smi_paths[i].name); } - path_ret = path_str->str; - g_string_free(path_str, FALSE); - return path_ret; + return g_string_free(path_str, FALSE); #else /* HAVE_LIBSMI */ return g_strdup(""); #endif |