path: root/rawshark.c
diff options
authorGuy Harris <guy@alum.mit.edu>2015-01-18 02:22:19 -0800
committerGuy Harris <guy@alum.mit.edu>2015-01-18 10:22:59 +0000
commitcfcbb286712ae392689e7cd1a640b57b611dd277 (patch)
treec41ab4705bb0b790da02bc8b29768b5879543474 /rawshark.c
parentc60fb3038e4a449c5488a32574d838a6599cb33f (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 'rawshark.c')
1 files changed, 5 insertions, 2 deletions
diff --git a/rawshark.c b/rawshark.c
index 29f4347787..41fce66ecf 100644
--- a/rawshark.c
+++ b/rawshark.c
@@ -806,8 +806,11 @@ main(int argc, char *argv[])
if (n_rfilters != 0) {
for (i = 0; i < n_rfilters; i++) {
- if (!dfilter_compile(rfilters[i], &rfcodes[n_rfcodes])) {
- cmdarg_err("%s", dfilter_error_msg);
+ gchar *err_msg;
+ if (!dfilter_compile(rfilters[i], &rfcodes[n_rfcodes], &err_msg)) {
+ cmdarg_err("%s", err_msg);
+ g_free(err_msg);