- add a register_menu funnel

- remove the field_menu altoghether (It was not what I thought)
- move a declaration to the start of a function to allow VC6 to compile




git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@17161 f5534014-38df-0310-8fa8-9805f1628bb7

3 files changed, 10 insertions, 27 deletions

diff --git a/epan/funnel.c b/epan/funnel.c
index 084f2edaaa..9bac9b472a 100644
--- a/epan/funnel.c
+++ b/epan/funnel.c
@@ -36,17 +36,16 @@ typedef struct _funnel_menu_t {
     struct _funnel_menu_t* next;
 } funnel_menu_t;
 
-
 static const funnel_ops_t* ops = NULL;
 static funnel_menu_t* menus = NULL;
 
 const funnel_ops_t* funnel_get_funnel_ops() { return ops;  }
 void funnel_set_funnel_ops(const funnel_ops_t* o) { ops = o; }
 
-extern void funnel_register_menu(const char *name,
-                                 REGISTER_STAT_GROUP_E group,
-                                 void (*callback)(gpointer),
-                                 gpointer callback_data) {
+void funnel_register_menu(const char *name,
+                          REGISTER_STAT_GROUP_E group,
+                          void (*callback)(gpointer),
+                          gpointer callback_data) {
     funnel_menu_t* m = g_malloc(sizeof(funnel_menu_t));
     m->name = g_strdup(name);
     m->group = group;
@@ -63,19 +62,12 @@ extern void funnel_register_menu(const char *name,
     }
 }
 
-
-extern void funnel_register_field_menu(const char *name _U_,
-                                       const char *field_abbrev _U_,
-                                       REGISTER_STAT_GROUP_E group _U_,
-                                       void (*callback)(gpointer) _U_,
-                                       gpointer callback_data _U_) {
-
-}
-
-extern void funnel_register_all_menus(funnel_registration_cb_t r_cb) {
+void funnel_register_all_menus(funnel_registration_cb_t r_cb) {
     funnel_menu_t* c;
     for (c = menus; c; c = c->next) {
         r_cb(c->name,c->group,c->callback,c->callback_data);
     }
 }
 
+
+
diff --git a/epan/funnel.h b/epan/funnel.h
index cfef7c04df..2d63e46a11 100644
--- a/epan/funnel.h
+++ b/epan/funnel.h
@@ -35,7 +35,6 @@
 #include <glib.h>
 #include "../stat_menu.h"
 
-
 typedef struct _funnel_text_window_t funnel_text_window_t ;
 typedef struct _funnel_tree_window_t funnel_tree_window_t ;
 typedef struct _funnel_node_t funnel_node_t ;
@@ -76,19 +75,12 @@ extern void funnel_register_menu(const char *name,
                                REGISTER_STAT_GROUP_E group,
                                void (*callback)(gpointer),
                                gpointer callback_data);
-#if 0
-extern void funnel_register_field_menu(const char *name,
-                                const char *field_abbrev,
-                                REGISTER_STAT_GROUP_E group,
-                                void (*callback)(gpointer),
-                                gpointer callback_data);
-#endif
 
 
 typedef void (*funnel_registration_cb_t)(const char *name,
-                 REGISTER_STAT_GROUP_E group,
-                 void (*callback)(gpointer),
-                 gpointer callback_data);
+                                         REGISTER_STAT_GROUP_E group,
+                                         void (*callback)(gpointer),
+                                         gpointer callback_data);
 
 extern void funnel_register_all_menus(funnel_registration_cb_t r_cb);
 
diff --git a/epan/libethereal.def b/epan/libethereal.def
index c4a380099a..8e49dfef08 100644
--- a/epan/libethereal.def
+++ b/epan/libethereal.def
@@ -283,7 +283,6 @@ fvalue_to_string_repr
 funnel_get_funnel_ops
 funnel_set_funnel_ops
 funnel_register_menu
-funnel_register_field_menu
 funnel_register_all_menus
 GatekeeperRejectReason_vals     DATA
 get_addr_name