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 /ui/gtk/gui_utils.h | |
| 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 'ui/gtk/gui_utils.h')
| -rw-r--r-- | ui/gtk/gui_utils.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ui/gtk/gui_utils.h b/ui/gtk/gui_utils.h index 9277824ac8..468c862817 100644 --- a/ui/gtk/gui_utils.h +++ b/ui/gtk/gui_utils.h @@ -189,13 +189,12 @@ extern void reactivate_window(GtkWidget *win); /** @} */ /** Alert box for an invalid display filter expression. - * Assumes "dfilter_error_msg" has been set by "dfilter_compile()" to the - * error message for the filter. * * @param parent parent window from which the display filter came * @param dftext text of the display filter + * @param err_msg text of the error message for the filter */ -extern void bad_dfilter_alert_box(GtkWidget *parent, const char *dftext); +extern void bad_dfilter_alert_box(GtkWidget *parent, const char *dftext, gchar *err_msg); /** Create a GtkScrolledWindow, set its scrollbar placement appropriately, * and remember it. |