diff options
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dfilter/dfilter-macro.c | 13 | ||||
-rw-r--r-- | epan/dfilter/dfilter-macro.h | 4 | ||||
-rw-r--r-- | epan/dfilter/dfilter.c | 2 | ||||
-rw-r--r-- | epan/uat-int.h | 2 | ||||
-rw-r--r-- | epan/uat.c | 4 |
5 files changed, 15 insertions, 10 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**) ¯os, &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 */ diff --git a/epan/uat-int.h b/epan/uat-int.h index ca46f1553f..4f9b8a48f7 100644 --- a/epan/uat-int.h +++ b/epan/uat-int.h @@ -82,5 +82,5 @@ gboolean uat_save(uat_t* dt, char** error); gboolean uat_load(uat_t* dt, char** error); #define UAT_UPDATE(uat) do { *((uat)->user_ptr) = (void*)((uat)->user_data->data); *((uat)->nrows_p) = (uat)->user_data->len; } while(0) - +#define UAT_INDEX_PTR(uat,idx) (uat->user_data->data + (uat->record_size * (idx))) #endif diff --git a/epan/uat.c b/epan/uat.c index 93bf611753..c0eeb8bad5 100644 --- a/epan/uat.c +++ b/epan/uat.c @@ -59,6 +59,10 @@ uat_t* uat_start(const char* name, uat_free_cb_t free_cb) { uat_t* uat = g_malloc(sizeof(uat_t)); + + if (!all_uats) + all_uats = g_ptr_array_new(); + g_ptr_array_add(all_uats,uat); g_assert(name && size && filename && data_ptr && num_items_ptr); |