aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dfilter/dfilter-int.h
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dfilter/dfilter-int.h')
-rw-r--r--epan/dfilter/dfilter-int.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/epan/dfilter/dfilter-int.h b/epan/dfilter/dfilter-int.h
index 8a7511de05..40e55488b5 100644
--- a/epan/dfilter/dfilter-int.h
+++ b/epan/dfilter/dfilter-int.h
@@ -44,6 +44,7 @@ typedef struct {
/* Syntax Tree stuff */
stnode_t *st_root;
gboolean syntax_error;
+ gchar *error_message;
GPtrArray *insns;
GPtrArray *consts;
GHashTable *loaded_fields;
@@ -54,6 +55,12 @@ typedef struct {
int first_constant; /* first register used as a constant */
} dfwork_t;
+/*
+ * XXX - if we're using a version of Flex that supports reentrant lexical
+ * analyzers, we should put this into the lexical analyzer's state.
+ */
+extern dfwork_t *global_dfw;
+
/* Constructor/Destructor prototypes for Lemon Parser */
void *DfilterAlloc(void* (*)(gsize));
@@ -66,9 +73,9 @@ extern stnode_t *df_lval;
/* Return value for error in scanner. */
#define SCAN_FAILED -1 /* not 0, as that means end-of-input */
-/* Set dfilter_error_msg_buf and dfilter_error_msg */
+/* Set dfw->error_message */
void
-dfilter_fail(const char *format, ...) G_GNUC_PRINTF(1, 2);
+dfilter_fail(dfwork_t *dfw, const char *format, ...) G_GNUC_PRINTF(2, 3);
void
DfilterTrace(FILE *TraceFILE, char *zTracePrompt);