aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dfilter
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dfilter')
-rw-r--r--epan/dfilter/dfilter-macro.c13
-rw-r--r--epan/dfilter/dfilter-macro.h4
-rw-r--r--epan/dfilter/dfilter.c2
3 files changed, 10 insertions, 9 deletions
diff --git a/epan/dfilter/dfilter-macro.c b/epan/dfilter/dfilter-macro.c
index 244565c589..b28cb5cc45 100644
--- a/epan/dfilter/dfilter-macro.c
+++ b/epan/dfilter/dfilter-macro.c
@@ -503,7 +503,7 @@ void dfilter_macro_init(void) {
char* error = NULL;
dfilter_macro_uat = uat_new("Display Filter Macros",
sizeof(dfilter_macro_t),
- "dfilter_macros",
+ DFILTER_MACRO_FILENAME,
(void**) &macros,
&num_macros,
macro_copy,
@@ -515,11 +515,12 @@ void dfilter_macro_init(void) {
NULL );
if(error) {
- report_failure("error while loading dfilter_macros:\n%s",error);
+ report_failure("error while loading '" DFILTER_MACRO_FILENAME "':\n%s",error);
}
-#ifdef DUMP_MACROS
- dfilter_macro_dump();
-#endif
-
}
+
+void dfilter_macro_get_uat(void** p) {
+ *p = dfilter_macro_uat;
+}
+
diff --git a/epan/dfilter/dfilter-macro.h b/epan/dfilter/dfilter-macro.h
index bc43e69637..bf30cbc53e 100644
--- a/epan/dfilter/dfilter-macro.h
+++ b/epan/dfilter/dfilter-macro.h
@@ -24,7 +24,7 @@
#ifndef _DFILTER_MACRO_H
#define _DFILTER_MACRO_H
-#define DFILTER_MACRO_FILENAME "df_macros"
+#define DFILTER_MACRO_FILENAME "dfilter_macros"
typedef struct _dfilter_macro_t {
@@ -49,4 +49,6 @@ gchar* dfilter_macro_apply(const gchar* text, guint depth, gchar** error);
void dfilter_macro_init(void);
+void dfilter_macro_get_uat(void**);
+
#endif /* _DFILTER_MACRO_H */
diff --git a/epan/dfilter/dfilter.c b/epan/dfilter/dfilter.c
index 8ad6061c53..775321076f 100644
--- a/epan/dfilter/dfilter.c
+++ b/epan/dfilter/dfilter.c
@@ -73,8 +73,6 @@ dfilter_fail(const char *format, ...)
void
dfilter_init(void)
{
- gchar* err;
-
if (ParserObj) {
g_message("I expected ParserObj to be NULL\n");
/* Free the Lemon Parser object */