Remove all $Id$ from top of file

[metze/wireshark/wip.git] / epan / funnel.c

diff --git a/epan/funnel.c b/epan/funnel.c
index 084f2edaaa3c39e3a492faf7fe2d2b65196132fd..17717179454f5fc080d1941980d5f0512508320a 100644 (file)
--- a/epan/funnel.c
+++ b/epan/funnel.c
@@ -3,12 +3,10 @@
  *
  * EPAN's GUI mini-API
  *
- * (c) 2006, Luis E. Garcia Ontanon <luis.ontanon@gmail.com>
+ * (c) 2006, Luis E. Garcia Ontanon <luis@ontanon.org>
  *
- * $Id$
- *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or
@@ -23,37 +21,41 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA. 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
+
 #include <epan/funnel.h>
 
 typedef struct _funnel_menu_t {
     const char *name;
-    REGISTER_STAT_GROUP_E group;
+    register_stat_group_t group;
     void (*callback)(gpointer);
     gpointer callback_data;
+    gboolean retap;
     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;  }
+const funnel_ops_t* funnel_get_funnel_ops(void) { 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) {
-    funnel_menu_t* m = g_malloc(sizeof(funnel_menu_t));
+void funnel_register_menu(const char *name,
+                          register_stat_group_t group,
+                          void (*callback)(gpointer),
+                          gpointer callback_data,
+                          gboolean retap) {
+    funnel_menu_t* m = (funnel_menu_t *)g_malloc(sizeof(funnel_menu_t));
     m->name = g_strdup(name);
     m->group = group;
     m->callback = callback;
     m->callback_data = callback_data;
+    m->retap = retap;
     m->next = NULL;
-    
+
     if (!menus)  {
         menus = m;
     } else {
@@ -63,19 +65,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);
+        r_cb(c->name,c->group,c->callback,c->callback_data,c->retap);
     }
 }
 
+
+