diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-01-18 02:22:19 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-01-18 10:22:59 +0000 |
| commit | cfcbb286712ae392689e7cd1a640b57b611dd277 (patch) | |
| tree | c41ab4705bb0b790da02bc8b29768b5879543474 /echld | |
| parent | c60fb3038e4a449c5488a32574d838a6599cb33f (diff) | |
Clean up ftype-conversion and dfilter error message string handling.
Have dfilter_compile() take an additional gchar ** argument, pointing to
a gchar * item that, on error, gets set to point to a g_malloc()ed error
string. That removes one bit of global state from the display filter
parser, and doesn't impose a fixed limit on the error message strings.
Have fvalue_from_string() and fvalue_from_unparsed() take a gchar **
argument, pointer to a gchar * item, rather than an error-reporting
function, and set the gchar * item to point to a g_malloc()ed error
string on an error.
Allow either gchar ** argument to be null; if the argument is null, no
error message is allocated or provided.
Change-Id: Ibd36b8aaa9bf4234aa6efa1e7fb95f7037493b4c
Reviewed-on: https://code.wireshark.org/review/6608
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'echld')
| -rw-r--r-- | echld/child.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/echld/child.c b/echld/child.c index 1441be0b20..9f24b85b36 100644 --- a/echld/child.c +++ b/echld/child.c @@ -230,21 +230,23 @@ static char* param_get_packet_count(char** err) { -static echld_bool_t param_set_dfilter(char* val , char** err _U_) { +static echld_bool_t param_set_dfilter(char* val , char** err) { dfilter_t *dfn = NULL; + gchar *err_msg; if (child.state != IDLE && child.state != DONE ) { *err = g_strdup("Only while idle or done"); return FALSE; - } else if ( dfilter_compile(val, &dfn) ) { - if (child.dfilter) g_free(child.dfilter); - if (child.df) dfilter_free(child.df); - child.df = dfn; - child.dfilter = g_strdup(val); - return TRUE; } else { - *err = g_strdup(dfilter_error_msg); - return FALSE; + if ( dfilter_compile(val, &dfn, err) ) { + if (child.dfilter) g_free(child.dfilter); + if (child.df) dfilter_free(child.df); + child.df = dfn; + child.dfilter = g_strdup(val); + return TRUE; + } else { + return FALSE; + } } } |