Make various dissectors static if they can be, and get rid of any header

files that no longer contain any information as a result of that change.

svn path=/trunk/; revision=1871

diff --git a/Makefile.am b/Makefile.am
index b501d2f891dfbf5a722c006f8c861dabedcf95f7..18ee68df6d34890f399a4b6e8f336626edf4f7f9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal
 #
-# $Id: Makefile.am,v 1.187 2000/04/16 22:46:18 guy Exp $
+# $Id: Makefile.am,v 1.188 2000/04/16 22:59:35 guy Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@zing.org>
@@ -124,7 +124,6 @@ DISSECTOR_SOURCES = \
        packet-mount.c \
        packet-mount.h \
        packet-mpls.c \
-       packet-mpls.h \
        packet-nbipx.c \
        packet-nbipx.h \
        packet-nbns.c  \
@@ -155,7 +154,6 @@ DISSECTOR_SOURCES = \
        packet-ppp.c   \
        packet-ppp.h   \
        packet-pppoe.c \
-       packet-pppoe.h \
        packet-pptp.c  \
        packet-q2931.c \
        packet-q2931.h \

diff --git a/packet-arp.c b/packet-arp.c
index 57513c91dfd38bf6603a3932b07de16725b7f552..f56010cd5e38609ed7cf1177ffc87a51d1309a94 100644 (file)
--- a/packet-arp.c
+++ b/packet-arp.c
@@ -1,7 +1,7 @@
 /* packet-arp.c
  * Routines for ARP packet disassembly
  *
- * $Id: packet-arp.c,v 1.27 2000/04/13 18:18:43 gram Exp $
+ * $Id: packet-arp.c,v 1.28 2000/04/16 22:59:36 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -548,7 +548,7 @@ dissect_atmarp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
   }
 }
 
-void
+static void
 dissect_arp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
 {
   guint16     ar_hrd;

diff --git a/packet-arp.h b/packet-arp.h
index 9b3f61bfbb50028f2ca5e75c809f747413b6b198..6da1857cb9a19b83dda5e776886089436b790232 100644 (file)
--- a/packet-arp.h
+++ b/packet-arp.h
@@ -2,7 +2,7 @@
  * Definitions of routines for ARP packet disassembly that are used
  * elsewhere
  *
- * $Id: packet-arp.h,v 1.2 2000/02/15 21:01:57 gram Exp $
+ * $Id: packet-arp.h,v 1.3 2000/04/16 22:59:36 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -31,6 +31,5 @@ gchar *arphrdaddr_to_str(guint8 *ad, int ad_len, guint16 type);
 gchar *arphrdtype_to_str(guint16 hwtype, const char *fmt);
 
 void dissect_atm_nsap(const u_char *pd, int offset, int len, proto_tree *tree);
-void dissect_arp(const u_char *, int, frame_data *, proto_tree *);
 
 #endif /* packet-atm.h */

diff --git a/packet-mpls.c b/packet-mpls.c
index 7c9cd5bbc39a96a9bf1757f538f064f35714663d..c6c95c3017cb20d4f3e72f906397e217536ce05e 100644 (file)
--- a/packet-mpls.c
+++ b/packet-mpls.c
@@ -3,7 +3,7 @@
  * 
  * (c) Copyright Ashok Narayanan <ashokn@cisco.com>
  *
- * $Id: packet-mpls.c,v 1.4 2000/04/13 18:18:48 gram Exp $
+ * $Id: packet-mpls.c,v 1.5 2000/04/16 22:59:37 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -45,7 +45,6 @@
 #include <glib.h>
 #include "etypes.h"
 #include "packet.h"
-#include "packet-mpls.h"
 #include "packet-ip.h"
 
 static gint proto_mpls = -1;
@@ -124,7 +123,7 @@ void decode_mpls_label(const unsigned char *start,
     *ttl = start[3];
 }
 
-void
+static void
 dissect_mpls(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) 
 {
     guint32 label;

diff --git a/packet-mpls.h b/packet-mpls.h
deleted file mode 100644 (file)
index 3a624f7..0000000
--- a/packet-mpls.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/**********************************************************************
- *
- * packet-mpls.h
- *
- * (C) Ashok Narayanan <ashokn@cisco.com>
- *
- * $Id: packet-mpls.h,v 1.1 2000/03/09 18:31:51 ashokn Exp $
- *
- * For license details, see the COPYING file with this distribution
- *
- **********************************************************************/
-
-void dissect_mpls(const u_char *, int, frame_data *, proto_tree *);

diff --git a/packet-pppoe.c b/packet-pppoe.c
index af15049757147b184c333222cecd68c1a156e0d9..f63ca80ae086cb589cebec78c213f1aed3de3422 100644 (file)
--- a/packet-pppoe.c
+++ b/packet-pppoe.c
@@ -1,7 +1,7 @@
 /* packet-arp.c
  * Routines for ARP packet disassembly
  *
- * $Id: packet-pppoe.c,v 1.6 2000/04/13 18:18:48 gram Exp $
+ * $Id: packet-pppoe.c,v 1.7 2000/04/16 22:59:37 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -59,7 +59,7 @@ static gint ett_pppoed_tags = -1;
 #define PPPOE_TAG_AC_ERR 0x0202 
 #define PPPOE_TAG_GENERIC_ERR 0x0203
 
-gchar *
+static gchar *
 pppoecode_to_str(guint8 codetype, const char *fmt) {
        static const value_string code_vals[] = {
                {PPPOE_CODE_SESSION, "Session Data"                             },
@@ -73,7 +73,7 @@ pppoecode_to_str(guint8 codetype, const char *fmt) {
                return val_to_str(codetype, code_vals, fmt);
 }
 
-gchar *
+static gchar *
 pppoetag_to_str(guint16 tag_type, const char *fmt) {
        static const value_string code_vals[] = {
                {PPPOE_TAG_EOL,        "End-Of-List"       },
@@ -92,7 +92,7 @@ pppoetag_to_str(guint16 tag_type, const char *fmt) {
 }
 
 
-void
+static void
 dissect_pppoe_tags(const u_char *pd, int offset, frame_data *fd, proto_tree *tree, int payload_length) {
 
        guint16 poe_tag;
@@ -144,7 +144,7 @@ dissect_pppoe_tags(const u_char *pd, int offset, frame_data *fd, proto_tree *tre
        }
 }
 
-void
+static void
 dissect_pppoed(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
        guint8 pppoe_ver;
        guint8 pppoe_type;
@@ -188,7 +188,7 @@ dissect_pppoed(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
 
 }
 
-void
+static void
 dissect_pppoes(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
        guint8 pppoe_ver;
        guint8 pppoe_type;

diff --git a/packet-pppoe.h b/packet-pppoe.h
deleted file mode 100644 (file)
index 3c50f68..0000000
--- a/packet-pppoe.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* packet-pppoe.h
- *
- * $Id: packet-pppoe.h,v 1.1 2000/02/15 21:02:54 gram Exp $
- *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
- * Copyright 1998 Gerald Combs
- *
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * 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.
- */
-
-
-void dissect_pppoed(const u_char *, int, frame_data *, proto_tree *);
-void dissect_pppoes(const u_char *, int, frame_data *, proto_tree *);

diff --git a/packet-vlan.c b/packet-vlan.c
index 6096ff40e6338dc9ad476bb4abafd9ed7919c2f1..874873ce1d1fbbd35431f7e0e1891f1e6a13088d 100644 (file)
--- a/packet-vlan.c
+++ b/packet-vlan.c
@@ -1,7 +1,7 @@
 /* packet-vlan.c
  * Routines for VLAN 802.1Q ethernet header disassembly
  *
- * $Id: packet-vlan.c,v 1.9 2000/04/13 18:18:52 gram Exp $
+ * $Id: packet-vlan.c,v 1.10 2000/04/16 22:59:37 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -68,7 +68,7 @@ capture_vlan(const u_char *pd, int offset, packet_counts *ld ) {
   }
 }
 
-void
+static void
 dissect_vlan(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
   proto_tree *ti, *vlan_tree = NULL;
   guint16 tci,encap_proto;

diff --git a/packet-vlan.h b/packet-vlan.h
index 9c4785fa44fdeddcf38b187eeaea09b6db41ab60..b7321e6a159b7c063084a3b52de5bdccfe492d15 100644 (file)
--- a/packet-vlan.h
+++ b/packet-vlan.h
@@ -1,6 +1,6 @@
 /* packet-vlan.h
  *
- * $Id: packet-vlan.h,v 1.1 2000/02/15 21:03:26 gram Exp $
+ * $Id: packet-vlan.h,v 1.2 2000/04/16 22:59:37 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -23,4 +23,3 @@
  */
 
 void capture_vlan(const u_char *, int, packet_counts *);
-void dissect_vlan(const u_char *, int, frame_data *, proto_tree *);