Drop dfilter_macro_load.l as dfilter-macro now uses UAT

svn path=/trunk/; revision=20596

1 files changed, 3 insertions, 16 deletions

diff --git a/epan/dfilter/dfilter-macro.h b/epan/dfilter/dfilter-macro.h
index 11fd6b8a7d..bc43e69637 100644
--- a/epan/dfilter/dfilter-macro.h
+++ b/epan/dfilter/dfilter-macro.h
@@ -30,36 +30,23 @@
 typedef struct _dfilter_macro_t {
 	gchar* name; /* the macro id */
 	gchar* text; /* raw data from file */
+	gboolean usable; /* macro is usable */
 	gchar** parts; /* various segments of text between insertion targets */
 	int* args_pos; /* what's to be inserted */
 	int argc; /* the expected number of arguments */
 	void* priv; /* a copy of text that contains every c-string in parts */
-	struct _dfilter_macro_t*  next; /* in macros list */
 } dfilter_macro_t;
 
 /* loop over the macros list */
 typedef void (*dfilter_macro_cb_t)(dfilter_macro_t*, void*);
 void dfilter_macro_foreach(dfilter_macro_cb_t, void*);
 
-/* add a macro to the list, text s raw text from file  */
-void dfilter_macro_add(const gchar* name, const gchar* text, gchar** error);
-
-/* remove a macro from the list */
-void dfilter_macro_remove(const gchar* name, gchar** error);
-
-/* loads the macros from file in userdir or else datadir */
-gboolean dfilter_macro_load(gchar** error);
-
-/* save the macro list to file */
-void dfilter_macro_save(const gchar* filename, gchar** error);
-
 /* dumps the macros in the list (debug info, not formated as in the macros file) */
 void dfilter_macro_dump(void);
 
-/* given a macro_name and its arguments returns an ep_allocated string */
-gchar* dfilter_macro_resolve(gchar* macro_name, gchar** macro_args, gchar** error);
-
 /* applies all macros to the given text and returns the resulting string or NULL on failure */
 gchar* dfilter_macro_apply(const gchar* text, guint depth, gchar** error);
 
+void dfilter_macro_init(void);
+
 #endif /* _DFILTER_MACRO_H */