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 /ui/capture.c | |
| parent | c60fb3038e4a449c5488a32574d838a6599cb33f (diff) | |
| download | wireshark-cfcbb286712ae392689e7cd1a640b57b611dd277.tar.gz | |
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 'ui/capture.c')
| -rw-r--r-- | ui/capture.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/capture.c b/ui/capture.c index 254cda3f4e..1a9543db42 100644 --- a/ui/capture.c +++ b/ui/capture.c @@ -514,7 +514,7 @@ capture_input_cfilter_error_message(capture_session *cap_session, guint i, safe_descr = simple_dialog_format_message(interface_opts.descr); safe_cfilter_error_msg = simple_dialog_format_message(error_message); /* Did the user try a display filter? */ - if (dfilter_compile(interface_opts.cfilter, &rfcode) && rfcode != NULL) { + if (dfilter_compile(interface_opts.cfilter, &rfcode, NULL) && rfcode != NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%sInvalid capture filter \"%s\" for interface %s.%s\n" "\n" |