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/tap-tcp-stream.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/tap-tcp-stream.c')
| -rw-r--r-- | ui/tap-tcp-stream.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/tap-tcp-stream.c b/ui/tap-tcp-stream.c index 370cdfd76d..c9b952b184 100644 --- a/ui/tap-tcp-stream.c +++ b/ui/tap-tcp-stream.c @@ -287,6 +287,7 @@ select_tcpip_session(capture_file *cf, struct segment *hdrs) frame_data *fdata; epan_dissect_t edt; dfilter_t *sfcode; + gchar *err_msg; GString *error_string; nstime_t rel_ts; th_t th = {0, {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}}; @@ -297,8 +298,9 @@ select_tcpip_session(capture_file *cf, struct segment *hdrs) fdata = cf->current_frame; /* no real filter yet */ - if (!dfilter_compile("tcp", &sfcode)) { - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", dfilter_error_msg); + if (!dfilter_compile("tcp", &sfcode, &err_msg)) { + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", err_msg); + g_free(err_msg); return NULL; } |