From 7e4e31f94c681eaa49a08495847960aa93af5786 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Mayer?= Date: Fri, 2 Aug 2002 22:04:22 +0000 Subject: Replace the types from sys/types.h and netinet/in.h by their glib.h equivalents for the plugins/ directory. svn path=/trunk/; revision=5929 --- plugins/docsis/packet-bpkmattr.c | 8 -------- plugins/docsis/packet-bpkmreq.c | 8 -------- plugins/docsis/packet-bpkmrsp.c | 8 -------- plugins/docsis/packet-docsis.c | 10 +--------- plugins/docsis/packet-docsis.h | 4 ++-- plugins/docsis/packet-dsaack.c | 8 -------- plugins/docsis/packet-dsareq.c | 8 -------- plugins/docsis/packet-dsarsp.c | 8 -------- plugins/docsis/packet-dscack.c | 8 -------- plugins/docsis/packet-dscreq.c | 8 -------- plugins/docsis/packet-dscrsp.c | 8 -------- plugins/docsis/packet-dsdreq.c | 8 -------- plugins/docsis/packet-dsdrsp.c | 8 -------- plugins/docsis/packet-macmgmt.c | 8 -------- plugins/docsis/packet-map.c | 8 -------- plugins/docsis/packet-regack.c | 8 -------- plugins/docsis/packet-regreq.c | 8 -------- plugins/docsis/packet-regrsp.c | 8 -------- plugins/docsis/packet-rngreq.c | 8 -------- plugins/docsis/packet-rngrsp.c | 8 -------- plugins/docsis/packet-tlv.c | 8 -------- plugins/docsis/packet-uccreq.c | 8 -------- plugins/docsis/packet-uccrsp.c | 8 -------- plugins/docsis/packet-ucd.c | 8 -------- 24 files changed, 3 insertions(+), 187 deletions(-) (limited to 'plugins/docsis') diff --git a/plugins/docsis/packet-bpkmattr.c b/plugins/docsis/packet-bpkmattr.c index e2baa9e132..5f222207b2 100644 --- a/plugins/docsis/packet-bpkmattr.c +++ b/plugins/docsis/packet-bpkmattr.c @@ -33,14 +33,6 @@ #include #include -#ifdef HAVE_SYS_TYPES_H -# include -#endif - -#ifdef HAVE_NETINET_IN_H -# include -#endif - #include #include diff --git a/plugins/docsis/packet-bpkmreq.c b/plugins/docsis/packet-bpkmreq.c index b9898a5f82..d76d000a34 100644 --- a/plugins/docsis/packet-bpkmreq.c +++ b/plugins/docsis/packet-bpkmreq.c @@ -33,14 +33,6 @@ #include #include -#ifdef HAVE_SYS_TYPES_H -# include -#endif - -#ifdef HAVE_NETINET_IN_H -# include -#endif - #include #include diff --git a/plugins/docsis/packet-bpkmrsp.c b/plugins/docsis/packet-bpkmrsp.c index 6b220326dd..aaad61c6bd 100644 --- a/plugins/docsis/packet-bpkmrsp.c +++ b/plugins/docsis/packet-bpkmrsp.c @@ -33,14 +33,6 @@ #include #include -#ifdef HAVE_SYS_TYPES_H -# include -#endif - -#ifdef HAVE_NETINET_IN_H -# include -#endif - #include #include diff --git a/plugins/docsis/packet-docsis.c b/plugins/docsis/packet-docsis.c index 8ac8e36925..0ec1d6ca73 100644 --- a/plugins/docsis/packet-docsis.c +++ b/plugins/docsis/packet-docsis.c @@ -2,7 +2,7 @@ * Routines for docsis dissection * Copyright 2002, Anand V. Narwani * - * $Id: packet-docsis.c,v 1.5 2002/07/22 20:18:23 guy Exp $ + * $Id: packet-docsis.c,v 1.6 2002/08/02 22:04:13 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -50,14 +50,6 @@ #include #include -#ifdef HAVE_SYS_TYPES_H -# include -#endif - -#ifdef HAVE_NETINET_IN_H -# include -#endif - #include #include diff --git a/plugins/docsis/packet-docsis.h b/plugins/docsis/packet-docsis.h index c7b27a2cf3..8cc82a6e1e 100644 --- a/plugins/docsis/packet-docsis.h +++ b/plugins/docsis/packet-docsis.h @@ -1,6 +1,6 @@ /* packet-docsis.h * - * $Id: packet-docsis.h,v 1.1 2002/07/12 22:52:41 guy Exp $ + * $Id: packet-docsis.h,v 1.2 2002/08/02 22:04:13 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -24,7 +24,7 @@ #ifndef __PACKET_DOCSIS_H__ #define __PACKET_DOCSIS_H__ -void capture_docsis (const u_char *, int, int, packet_counts *); +void capture_docsis (const guchar *, int, int, packet_counts *); void proto_reg_handoff_docsis_bpkmattr (void); void proto_reg_handoff_docsis_bpkmreq (void); void proto_reg_handoff_docsis_bpkmrsp (void); diff --git a/plugins/docsis/packet-dsaack.c b/plugins/docsis/packet-dsaack.c index 12d6eb6946..e44687a52e 100644 --- a/plugins/docsis/packet-dsaack.c +++ b/plugins/docsis/packet-dsaack.c @@ -33,14 +33,6 @@ #include #include -#ifdef HAVE_SYS_TYPES_H -# include -#endif - -#ifdef HAVE_NETINET_IN_H -# include -#endif - #include #include diff --git a/plugins/docsis/packet-dsareq.c b/plugins/docsis/packet-dsareq.c index 4c6b7808bf..c0efe665f3 100644 --- a/plugins/docsis/packet-dsareq.c +++ b/plugins/docsis/packet-dsareq.c @@ -33,14 +33,6 @@ #include #include -#ifdef HAVE_SYS_TYPES_H -# include -#endif - -#ifdef HAVE_NETINET_IN_H -# include -#endif - #include #include diff --git a/plugins/docsis/packet-dsarsp.c b/plugins/docsis/packet-dsarsp.c index 6d79955e71..db2a4bbc48 100644 --- a/plugins/docsis/packet-dsarsp.c +++ b/plugins/docsis/packet-dsarsp.c @@ -33,14 +33,6 @@ #include #include -#ifdef HAVE_SYS_TYPES_H -# include -#endif - -#ifdef HAVE_NETINET_IN_H -# include -#endif - #include #include diff --git a/plugins/docsis/packet-dscack.c b/plugins/docsis/packet-dscack.c index fabc8f11d3..f697c1e0ef 100644 --- a/plugins/docsis/packet-dscack.c +++ b/plugins/docsis/packet-dscack.c @@ -33,14 +33,6 @@ #include #include -#ifdef HAVE_SYS_TYPES_H -# include -#endif - -#ifdef HAVE_NETINET_IN_H -# include -#endif - #include #include diff --git a/plugins/docsis/packet-dscreq.c b/plugins/docsis/packet-dscreq.c index 9bb7a64446..5deaa078cd 100644 --- a/plugins/docsis/packet-dscreq.c +++ b/plugins/docsis/packet-dscreq.c @@ -33,14 +33,6 @@ #include #include -#ifdef HAVE_SYS_TYPES_H -# include -#endif - -#ifdef HAVE_NETINET_IN_H -# include -#endif - #include #include diff --git a/plugins/docsis/packet-dscrsp.c b/plugins/docsis/packet-dscrsp.c index 9d187d3ef3..686ea0bdbc 100644 --- a/plugins/docsis/packet-dscrsp.c +++ b/plugins/docsis/packet-dscrsp.c @@ -33,14 +33,6 @@ #include #include -#ifdef HAVE_SYS_TYPES_H -# include -#endif - -#ifdef HAVE_NETINET_IN_H -# include -#endif - #include #include diff --git a/plugins/docsis/packet-dsdreq.c b/plugins/docsis/packet-dsdreq.c index 7d29ce65a8..2ad1945406 100644 --- a/plugins/docsis/packet-dsdreq.c +++ b/plugins/docsis/packet-dsdreq.c @@ -33,14 +33,6 @@ #include #include -#ifdef HAVE_SYS_TYPES_H -# include -#endif - -#ifdef HAVE_NETINET_IN_H -# include -#endif - #include #include diff --git a/plugins/docsis/packet-dsdrsp.c b/plugins/docsis/packet-dsdrsp.c index c06a37688f..d618ac366a 100644 --- a/plugins/docsis/packet-dsdrsp.c +++ b/plugins/docsis/packet-dsdrsp.c @@ -33,14 +33,6 @@ #include #include -#ifdef HAVE_SYS_TYPES_H -# include -#endif - -#ifdef HAVE_NETINET_IN_H -# include -#endif - #include #include diff --git a/plugins/docsis/packet-macmgmt.c b/plugins/docsis/packet-macmgmt.c index 1cd0c0e858..45d4e18ad0 100644 --- a/plugins/docsis/packet-macmgmt.c +++ b/plugins/docsis/packet-macmgmt.c @@ -34,14 +34,6 @@ #include #include -#ifdef HAVE_SYS_TYPES_H -# include -#endif - -#ifdef HAVE_NETINET_IN_H -# include -#endif - #include #include diff --git a/plugins/docsis/packet-map.c b/plugins/docsis/packet-map.c index 78c2a7fb93..d2fb6467a3 100644 --- a/plugins/docsis/packet-map.c +++ b/plugins/docsis/packet-map.c @@ -34,14 +34,6 @@ #include #include -#ifdef HAVE_SYS_TYPES_H -# include -#endif - -#ifdef HAVE_NETINET_IN_H -# include -#endif - #include #include diff --git a/plugins/docsis/packet-regack.c b/plugins/docsis/packet-regack.c index 8763d031e9..181d470c28 100644 --- a/plugins/docsis/packet-regack.c +++ b/plugins/docsis/packet-regack.c @@ -33,14 +33,6 @@ #include #include -#ifdef HAVE_SYS_TYPES_H -# include -#endif - -#ifdef HAVE_NETINET_IN_H -# include -#endif - #include #include diff --git a/plugins/docsis/packet-regreq.c b/plugins/docsis/packet-regreq.c index 80f6aa6dc3..b402ca5b31 100644 --- a/plugins/docsis/packet-regreq.c +++ b/plugins/docsis/packet-regreq.c @@ -33,14 +33,6 @@ #include #include -#ifdef HAVE_SYS_TYPES_H -# include -#endif - -#ifdef HAVE_NETINET_IN_H -# include -#endif - #include #include diff --git a/plugins/docsis/packet-regrsp.c b/plugins/docsis/packet-regrsp.c index 6d6b025b21..e0196d64e4 100644 --- a/plugins/docsis/packet-regrsp.c +++ b/plugins/docsis/packet-regrsp.c @@ -33,14 +33,6 @@ #include #include -#ifdef HAVE_SYS_TYPES_H -# include -#endif - -#ifdef HAVE_NETINET_IN_H -# include -#endif - #include #include diff --git a/plugins/docsis/packet-rngreq.c b/plugins/docsis/packet-rngreq.c index 76625ea627..ac59ce08af 100644 --- a/plugins/docsis/packet-rngreq.c +++ b/plugins/docsis/packet-rngreq.c @@ -34,14 +34,6 @@ #include #include -#ifdef HAVE_SYS_TYPES_H -# include -#endif - -#ifdef HAVE_NETINET_IN_H -# include -#endif - #include #include diff --git a/plugins/docsis/packet-rngrsp.c b/plugins/docsis/packet-rngrsp.c index 27b5077d90..fae001a541 100644 --- a/plugins/docsis/packet-rngrsp.c +++ b/plugins/docsis/packet-rngrsp.c @@ -33,14 +33,6 @@ #include #include -#ifdef HAVE_SYS_TYPES_H -# include -#endif - -#ifdef HAVE_NETINET_IN_H -# include -#endif - #include #include diff --git a/plugins/docsis/packet-tlv.c b/plugins/docsis/packet-tlv.c index 919d7d6961..314b8a5de4 100644 --- a/plugins/docsis/packet-tlv.c +++ b/plugins/docsis/packet-tlv.c @@ -34,14 +34,6 @@ #include #include -#ifdef HAVE_SYS_TYPES_H -# include -#endif - -#ifdef HAVE_NETINET_IN_H -# include -#endif - #include #include diff --git a/plugins/docsis/packet-uccreq.c b/plugins/docsis/packet-uccreq.c index 7c33750622..e33734068d 100644 --- a/plugins/docsis/packet-uccreq.c +++ b/plugins/docsis/packet-uccreq.c @@ -29,18 +29,10 @@ #include #include -#ifdef HAVE_SYS_TYPES_H -# include -#endif - #include "plugins/plugin_api.h" #include "plugins/plugin_api_defs.h" #include "moduleinfo.h" -#ifdef HAVE_NETINET_IN_H -# include -#endif - #include #include diff --git a/plugins/docsis/packet-uccrsp.c b/plugins/docsis/packet-uccrsp.c index d26d51da0f..3227ab3c25 100644 --- a/plugins/docsis/packet-uccrsp.c +++ b/plugins/docsis/packet-uccrsp.c @@ -33,14 +33,6 @@ #include #include -#ifdef HAVE_SYS_TYPES_H -# include -#endif - -#ifdef HAVE_NETINET_IN_H -# include -#endif - #include #include diff --git a/plugins/docsis/packet-ucd.c b/plugins/docsis/packet-ucd.c index 5b2dad9810..5f369a8ff1 100644 --- a/plugins/docsis/packet-ucd.c +++ b/plugins/docsis/packet-ucd.c @@ -35,14 +35,6 @@ #include #include -#ifdef HAVE_SYS_TYPES_H -# include -#endif - -#ifdef HAVE_NETINET_IN_H -# include -#endif - #include #include -- cgit v1.2.3