From cfcbb286712ae392689e7cd1a640b57b611dd277 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sun, 18 Jan 2015 02:22:19 -0800 Subject: 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 --- ui/tap-tcp-stream.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'ui/tap-tcp-stream.c') 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; } -- cgit v1.2.1