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 /tshark.c | |
| 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 'tshark.c')
| -rw-r--r-- | tshark.c | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -993,6 +993,7 @@ main(int argc, char *argv[]) #endif dfilter_t *rfcode = NULL; dfilter_t *dfcode = NULL; + gchar *err_msg; e_prefs *prefs_p; char badopt; int log_flags; @@ -2026,8 +2027,9 @@ main(int argc, char *argv[]) #endif if (rfilter != NULL) { - if (!dfilter_compile(rfilter, &rfcode)) { - cmdarg_err("%s", dfilter_error_msg); + if (!dfilter_compile(rfilter, &rfcode, &err_msg)) { + cmdarg_err("%s", err_msg); + g_free(err_msg); epan_cleanup(); #ifdef HAVE_PCAP_OPEN_DEAD { @@ -2050,8 +2052,9 @@ main(int argc, char *argv[]) cfile.rfcode = rfcode; if (dfilter != NULL) { - if (!dfilter_compile(dfilter, &dfcode)) { - cmdarg_err("%s", dfilter_error_msg); + if (!dfilter_compile(dfilter, &dfcode, &err_msg)) { + cmdarg_err("%s", err_msg); + g_free(err_msg); epan_cleanup(); #ifdef HAVE_PCAP_OPEN_DEAD { @@ -2587,7 +2590,7 @@ capture_input_cfilter_error_message(capture_session *cap_session, guint i, char g_assert(i < capture_opts->ifaces->len); interface_opts = g_array_index(capture_opts->ifaces, interface_options, i); - if (dfilter_compile(interface_opts.cfilter, &rfcode) && rfcode != NULL) { + if (dfilter_compile(interface_opts.cfilter, &rfcode, NULL) && rfcode != NULL) { cmdarg_err( "Invalid capture filter \"%s\" for interface '%s'.\n" "\n" |