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 /epan/ftypes/ftypes.h | |
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 'epan/ftypes/ftypes.h')
-rw-r--r-- | epan/ftypes/ftypes.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/ftypes/ftypes.h b/epan/ftypes/ftypes.h index 6e969043ca..d830722fc4 100644 --- a/epan/ftypes/ftypes.h +++ b/epan/ftypes/ftypes.h @@ -203,8 +203,6 @@ typedef struct _fvalue_t { } fvalue_t; -typedef void (*LogFunc)(const char*,...); - fvalue_t* fvalue_new(ftenum_t ftype); @@ -213,10 +211,10 @@ fvalue_init(fvalue_t *fv, ftenum_t ftype); WS_DLL_PUBLIC fvalue_t* -fvalue_from_unparsed(ftenum_t ftype, const char *s, gboolean allow_partial_value, LogFunc logfunc); +fvalue_from_unparsed(ftenum_t ftype, const char *s, gboolean allow_partial_value, gchar **err_msg); fvalue_t* -fvalue_from_string(ftenum_t ftype, const char *s, LogFunc logfunc); +fvalue_from_string(ftenum_t ftype, const char *s, gchar **err_msg); /* Returns the length of the string required to hold the * string representation of the the field value. |