osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Guy Harris 2015-02-17 14:54:37 -08:00
parent 23c8bb814c
commit efd18e61f8
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dfilter/dfilter-macro.c
View File

@ -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 */