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-macro.h | |
| 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-macro.h')
| -rw-r--r-- | epan/dfilter/dfilter-macro.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dfilter/dfilter-macro.h b/epan/dfilter/dfilter-macro.h index 89622529ab..9516648de2 100644 --- a/epan/dfilter/dfilter-macro.h +++ b/epan/dfilter/dfilter-macro.h @@ -42,7 +42,7 @@ typedef struct _dfilter_macro_t { } dfilter_macro_t; /* applies all macros to the given text and returns the resulting string or NULL on failure */ -const gchar* dfilter_macro_apply(const gchar* text, gchar** error); +gchar* dfilter_macro_apply(const gchar* text, gchar** error); void dfilter_macro_init(void); |