diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-02-17 14:54:37 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-02-17 22:55:10 +0000 |
| commit | efd18e61f8b628769e6d5dddf57f5a77e97758af (patch) | |
| tree | 489890fe3c408c41b4c18a980770ab603dd90f20 | |
| parent | 23c8bb814ccd212dcdce0735f4bde898c41f73d7 (diff) | |
A UAT's update is expected to set *error; do so.
Its callers treat a non-null error pointer as a failure and a null error
pointer as a success, so it has to set *error, even if it's only setting
it to NULL.
Change-Id: I48b2faa4bc013e4a754180dfae487829c8fe35a6
Reviewed-on: https://code.wireshark.org/review/7211
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | epan/dfilter/dfilter-macro.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/epan/dfilter/dfilter-macro.c b/epan/dfilter/dfilter-macro.c index 234e2cea00..82d430838b 100644 --- a/epan/dfilter/dfilter-macro.c +++ b/epan/dfilter/dfilter-macro.c @@ -403,7 +403,7 @@ const gchar* dfilter_macro_apply(const gchar* text, gchar** error) { return dfilter_macro_apply_recurse(text, 0, error); } -static void macro_update(void* mp, gchar** error _U_) { +static void macro_update(void* mp, gchar** error) { dfilter_macro_t* m = (dfilter_macro_t*)mp; GPtrArray* parts; GArray* args_pos; @@ -412,6 +412,8 @@ static void macro_update(void* mp, gchar** error _U_) { gchar* part; int argc = 0; + *error = NULL; + DUMP_MACRO(m); /* Invalidate the display filter in case it's in use */ |