diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-12-05 12:40:58 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-12-05 20:41:32 +0000 |
| commit | 4348d4dd34d0efaa5eb9e42969243a309b7115de (patch) | |
| tree | d9ea2411124fdf6855446cfb36463638bf6ad6bc /epan/dfilter/dfilter.c | |
| parent | b3fa4f34f401a4d675c8fb936b1547b0a8fda5c2 (diff) | |
| download | wireshark-4348d4dd34d0efaa5eb9e42969243a309b7115de.tar.gz | |
Type cleanups.
dfilter_macro_apply_recurse() returns either NULL or a pointer to
freshly-allocated memory, so it doesn't return a const pointer.
dfilter_macro_apply() calls dfilter_macro_apply_recurse(), so it doesn't
return a const pointer, either.
In dfilter_compile(), have separate variables for the filter handed in
and the macro-expanded filter, the former being const gchar * and the
latter being gchar *.
Change-Id: I191549bf0ff6c09c1278a98432a907c93d5e0e74
Reviewed-on: https://code.wireshark.org/review/12446
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dfilter/dfilter.c')
| -rw-r--r-- | epan/dfilter/dfilter.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/epan/dfilter/dfilter.c b/epan/dfilter/dfilter.c index 030a0efcba..a843bbe936 100644 --- a/epan/dfilter/dfilter.c +++ b/epan/dfilter/dfilter.c @@ -210,6 +210,7 @@ dfwork_free(dfwork_t *dfw) gboolean dfilter_compile(const gchar *text, dfilter_t **dfp, gchar **err_msg) { + gchar *expanded_text; int token; dfilter_t *dfilter; dfwork_t *dfw; @@ -228,7 +229,7 @@ dfilter_compile(const gchar *text, dfilter_t **dfp, gchar **err_msg) return FALSE; } - if ( !( text = dfilter_macro_apply(text, err_msg) ) ) { + if ( !( expanded_text = dfilter_macro_apply(text, err_msg) ) ) { return FALSE; } @@ -240,7 +241,7 @@ dfilter_compile(const gchar *text, dfilter_t **dfp, gchar **err_msg) */ global_dfw = dfw; - df_scanner_text(text); + df_scanner_text(expanded_text); deprecated = g_ptr_array_new(); @@ -359,7 +360,7 @@ dfilter_compile(const gchar *text, dfilter_t **dfp, gchar **err_msg) /* SUCCESS */ global_dfw = NULL; dfwork_free(dfw); - wmem_free(NULL, (char*)text); + wmem_free(NULL, expanded_text); return TRUE; FAILURE: @@ -384,7 +385,7 @@ FAILURE: * case for any error. */ if (*err_msg == NULL) - *err_msg = g_strdup_printf("Unable to parse filter string \"%s\".", text); + *err_msg = g_strdup_printf("Unable to parse filter string \"%s\".", expanded_text); } *dfp = NULL; return FALSE; |