Immediately quit routines if fwrite() fails - further writes will

[obnox/wireshark/wip.git] / gtk / conversations_fddi.c

diff --git a/gtk/conversations_fddi.c b/gtk/conversations_fddi.c
index ddf09f9817035fa641d1576589f9a3b83ef2713a..ac9784ee65ed766cb0777948719fef888fb11a32 100644 (file)
--- a/gtk/conversations_fddi.c
+++ b/gtk/conversations_fddi.c
@@ -3,8 +3,8 @@
  *
  * $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
@@ -33,19 +33,21 @@
 #include <gtk/gtk.h>
 #include <string.h>
 #include "epan/packet.h"
-#include "tap_menu.h"
-#include "../tap.h"
+#include <epan/stat_cmd_args.h>
+#include "../stat_menu.h"
+#include "gui_stat_menu.h"
+#include <epan/tap.h>
 #include "../register.h"
 #include "conversations_table.h"
 #include <epan/dissectors/packet-fddi.h>
 
 
 static int
-fddi_talkers_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, void *vip)
+fddi_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
 {
-       fddi_hdr *ehdr=vip;
+       const fddi_hdr *ehdr=vip;
 
-       add_ett_table_data((conversations_table *)pct, &ehdr->src, &ehdr->dst, 0, 0, 1, pinfo->fd->pkt_len, SAT_FDDI, PT_NONE);
+       add_conversation_table_data((conversations_table *)pct, &ehdr->src, &ehdr->dst, 0, 0, 1, pinfo->fd->pkt_len, SAT_FDDI, PT_NONE);
 
        return 1;
 }
@@ -53,9 +55,9 @@ fddi_talkers_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, void
 
 
 static void
-gtk_fddi_talkers_init(char *optarg)
+fddi_conversation_init(const char *optarg, void* userdata _U_ )
 {
-       char *filter=NULL;
+       const char *filter=NULL;
 
        if(!strncmp(optarg,"conv,fddi,",10)){
                filter=optarg+10;
@@ -63,26 +65,25 @@ gtk_fddi_talkers_init(char *optarg)
                filter=NULL;
        }
 
-       init_ett_table(TRUE, "FDDI", "fddi", filter, (void *)fddi_talkers_packet);
+       init_conversation_table(TRUE, "FDDI", "fddi", filter, fddi_conversation_packet);
 
 }
 
 
 static void
-gtk_fddi_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
+fddi_endpoints_cb(GtkWidget *w _U_, gpointer d _U_)
 {
-       gtk_fddi_talkers_init("conv,fddi");
+       fddi_conversation_init("conv,fddi",NULL);
 }
 
 
 void
-register_tap_listener_fddi_talkers(void)
+register_tap_listener_fddi_conversation(void)
 {
-       register_ethereal_tap("conv,fddi", gtk_fddi_talkers_init);
+       register_stat_cmd_arg("conv,fddi", fddi_conversation_init,NULL);
 
-       register_tap_menu_item("FDDI", REGISTER_TAP_GROUP_CONVERSATION_LIST,
-           gtk_fddi_endpoints_cb, NULL, NULL, NULL);
+       register_stat_menu_item("FDDI", REGISTER_STAT_GROUP_CONVERSATION_LIST,
+           fddi_endpoints_cb, NULL, NULL, NULL);
 
-       register_ett_table(TRUE, "FDDI", "fddi", NULL /*filter*/, (void *)fddi_talkers_packet);
+       register_conversation_table(TRUE, "FDDI", "fddi", NULL /*filter*/, fddi_conversation_packet);
 }
-