aboutsummaryrefslogtreecommitdiffstats
path: root/epan/funnel.h
diff options
context:
space:
mode:
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 /epan/funnel.h
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 'epan/funnel.h')
-rw-r--r--epan/funnel.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/funnel.h b/epan/funnel.h
index 2b2282ab75..3d66f54c63 100644
--- a/epan/funnel.h
+++ b/epan/funnel.h
@@ -79,7 +79,7 @@ typedef struct _funnel_ops_t {
gchar * (*get_filter)(void);
void (*set_filter)(const char*);
void (*set_color_filter_slot)(guint8 flit_nr, const gchar* filter);
- gboolean (*open_file)(const char* fname, const char* filter, const char** error);
+ gboolean (*open_file)(const char* fname, const char* filter, char** error);
void (*reload)(void);
void (*apply_filter)(void);