From 77fa06b8995c884495c533a3536eb252659d086c Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Wed, 17 Jul 2002 00:43:03 +0000 Subject: From Joerg Mayer: dftest.c: Remove #if-0-ed includes packet-ieee80211.c, packet-wtls.c, packet-afp.c, packet-wsp.c, packet-wtp.c, ethereal_gen.py: Remove redundant include varargs (already in snprintf.h, and required only for snprintf.h) Remove unused include of snprintf.h from files not using "snprintf()". svn path=/trunk/; revision=5889 --- dftest.c | 28 +--------------------------- epan/ftypes/ftype-integer.c | 7 +------ epan/osi-utils.c | 6 +----- epan/packet.c | 6 +----- ethereal_gen.py | 7 +------ gtk/capture_dlg.c | 6 +----- gtk/display_opts.c | 6 +----- gtk/proto_draw.c | 6 +----- packet-afp.c | 7 +------ packet-aim.c | 6 +----- packet-ajp13.c | 6 +----- packet-bacapp.c | 6 +----- packet-bacnet.c | 6 +----- packet-bvlc.c | 6 +----- packet-gmrp.c | 6 +----- packet-gnutella.c | 6 +----- packet-gtp.c | 6 +----- packet-gvrp.c | 6 +----- packet-iapp.c | 6 +----- packet-icq.c | 6 +----- packet-ieee80211.c | 7 +------ packet-iscsi.c | 6 +----- packet-isup.c | 6 +----- packet-lmp.c | 6 +----- packet-m3ua.c | 6 +----- packet-mbtcp.c | 6 +----- packet-mip.c | 6 +----- packet-mmse.c | 6 +----- packet-msproxy.c | 6 +----- packet-ranap.c | 6 +----- packet-rmi.c | 6 +----- packet-smpp.c | 6 +----- packet-socks.c | 6 +----- packet-srvloc.c | 6 +----- packet-ssl.c | 6 +----- packet-sua.c | 6 +----- packet-tcp.c | 6 +----- packet-ucp.c | 6 +----- packet-wsp.c | 7 +------ packet-wtls.c | 7 +------ packet-wtp.c | 7 +------ plugins/docsis/packet-bpkmattr.c | 4 ---- plugins/docsis/packet-bpkmreq.c | 4 ---- plugins/docsis/packet-bpkmrsp.c | 4 ---- plugins/docsis/packet-docsis.c | 6 +----- plugins/docsis/packet-dsaack.c | 4 ---- plugins/docsis/packet-dsareq.c | 4 ---- plugins/docsis/packet-dsarsp.c | 4 ---- plugins/docsis/packet-dscack.c | 4 ---- plugins/docsis/packet-dscreq.c | 4 ---- plugins/docsis/packet-dscrsp.c | 4 ---- plugins/docsis/packet-dsdreq.c | 4 ---- plugins/docsis/packet-dsdrsp.c | 4 ---- plugins/docsis/packet-macmgmt.c | 4 ---- plugins/docsis/packet-map.c | 4 ---- plugins/docsis/packet-regack.c | 4 ---- plugins/docsis/packet-regreq.c | 4 ---- plugins/docsis/packet-regrsp.c | 4 ---- plugins/docsis/packet-rngreq.c | 4 ---- plugins/docsis/packet-rngrsp.c | 4 ---- plugins/docsis/packet-tlv.c | 4 ---- plugins/docsis/packet-uccreq.c | 4 ---- plugins/docsis/packet-uccrsp.c | 4 ---- plugins/docsis/packet-ucd.c | 4 ---- plugins/giop/packet-coseventcomm.c | 9 --------- plugins/giop/packet-cosnaming.c | 9 --------- 66 files changed, 42 insertions(+), 345 deletions(-) diff --git a/dftest.c b/dftest.c index fa7e0aac2f..0b877a1210 100644 --- a/dftest.c +++ b/dftest.c @@ -1,6 +1,6 @@ /* dftest.c.c * - * $Id: dftest.c,v 1.3 2002/01/21 07:36:31 guy Exp $ + * $Id: dftest.c,v 1.4 2002/07/17 00:42:39 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -34,32 +34,6 @@ #include #include -#if 0 - -#ifdef HAVE_UNISTD_H -#include -#endif - - -#ifdef HAVE_SYS_TYPES_H -#include -#endif - -#ifdef HAVE_SYS_STAT_H -#include -#endif - -#ifdef HAVE_FCNTL_H -#include -#endif - -#include - -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif -#endif - #ifdef NEED_STRERROR_H #include "strerror.h" #endif diff --git a/epan/ftypes/ftype-integer.c b/epan/ftypes/ftype-integer.c index 96b416dcd7..d1521940b0 100644 --- a/epan/ftypes/ftype-integer.c +++ b/epan/ftypes/ftype-integer.c @@ -1,5 +1,5 @@ /* - * $Id: ftype-integer.c,v 1.8 2002/02/05 22:50:17 guy Exp $ + * $Id: ftype-integer.c,v 1.9 2002/07/17 00:42:54 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -24,11 +24,6 @@ #include "config.h" #endif - -#ifdef NEED_SNPRINTF_H -#include "snprintf.h" -#endif - #include #include #include "ftypes-int.h" diff --git a/epan/osi-utils.c b/epan/osi-utils.c index 245612add0..6606e4e64e 100644 --- a/epan/osi-utils.c +++ b/epan/osi-utils.c @@ -2,7 +2,7 @@ * Routines for ISO/OSI network and transport protocol packet disassembly * Main entrance point and common functions * - * $Id: osi-utils.c,v 1.5 2002/06/28 22:43:49 guy Exp $ + * $Id: osi-utils.c,v 1.6 2002/07/17 00:42:51 guy Exp $ * Laurent Deniel * Ralf Schneider * @@ -35,10 +35,6 @@ # include #endif -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include #include diff --git a/epan/packet.c b/epan/packet.c index d6a01b748d..5a4177fbd2 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -1,7 +1,7 @@ /* packet.c * Routines for packet disassembly * - * $Id: packet.c,v 1.73 2002/06/23 10:32:32 guy Exp $ + * $Id: packet.c,v 1.74 2002/07/17 00:42:51 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -51,10 +51,6 @@ #include #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #ifdef HAVE_NETINET_IN_H # include #endif diff --git a/ethereal_gen.py b/ethereal_gen.py index e45c69ac0b..dd98fc4bd5 100644 --- a/ethereal_gen.py +++ b/ethereal_gen.py @@ -1,6 +1,6 @@ # -*- python -*- # -# $Id: ethereal_gen.py,v 1.26 2002/05/06 21:50:28 guy Exp $ +# $Id: ethereal_gen.py,v 1.27 2002/07/17 00:42:40 guy Exp $ # # ethereal_gen.py (part of idl2eth) # @@ -2188,11 +2188,6 @@ for (i_@aname@=0; i_@aname@ < @aval@; i_@aname@++) { #endif #ifdef NEED_SNPRINTF_H -# ifdef HAVE_STDARG_H -# include -# else -# include -# endif # include "snprintf.h" #endif diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c index b9eb6151de..743eae4860 100644 --- a/gtk/capture_dlg.c +++ b/gtk/capture_dlg.c @@ -1,7 +1,7 @@ /* capture_dlg.c * Routines for packet capture windows * - * $Id: capture_dlg.c,v 1.69 2002/06/24 20:56:15 guy Exp $ + * $Id: capture_dlg.c,v 1.70 2002/07/17 00:42:56 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -41,10 +41,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include "capture.h" #include "globals.h" #include diff --git a/gtk/display_opts.c b/gtk/display_opts.c index a82996b830..2a129cdde5 100644 --- a/gtk/display_opts.c +++ b/gtk/display_opts.c @@ -1,7 +1,7 @@ /* display_opts.c * Routines for packet display windows * - * $Id: display_opts.c,v 1.26 2002/03/05 11:55:58 guy Exp $ + * $Id: display_opts.c,v 1.27 2002/07/17 00:42:56 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -46,10 +46,6 @@ # include #endif -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include "globals.h" #include #include diff --git a/gtk/proto_draw.c b/gtk/proto_draw.c index 47afd07366..e817484086 100644 --- a/gtk/proto_draw.c +++ b/gtk/proto_draw.c @@ -1,7 +1,7 @@ /* proto_draw.c * Routines for GTK+ packet display * - * $Id: proto_draw.c,v 1.54 2002/06/24 00:08:28 guy Exp $ + * $Id: proto_draw.c,v 1.55 2002/07/17 00:42:56 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -39,10 +39,6 @@ #include #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include #include diff --git a/packet-afp.c b/packet-afp.c index cba9357147..e53d74c63e 100644 --- a/packet-afp.c +++ b/packet-afp.c @@ -2,7 +2,7 @@ * Routines for afp packet dissection * Copyright 2002, Didier Gautheron * - * $Id: packet-afp.c,v 1.17 2002/06/20 00:44:33 guy Exp $ + * $Id: packet-afp.c,v 1.18 2002/07/17 00:42:40 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -41,11 +41,6 @@ #endif #ifdef NEED_SNPRINTF_H -# ifdef HAVE_STDARG_H -# include -# else -# include -# endif # include "snprintf.h" #endif diff --git a/packet-aim.c b/packet-aim.c index 7e5873b767..141b64dd58 100644 --- a/packet-aim.c +++ b/packet-aim.c @@ -2,7 +2,7 @@ * Routines for AIM Instant Messenger (OSCAR) dissection * Copyright 2000, Ralf Hoelzer * - * $Id: packet-aim.c,v 1.14 2002/01/24 09:20:47 guy Exp $ + * $Id: packet-aim.c,v 1.15 2002/07/17 00:42:40 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -42,10 +42,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include #include diff --git a/packet-ajp13.c b/packet-ajp13.c index 4553463e44..e0e0e43450 100644 --- a/packet-ajp13.c +++ b/packet-ajp13.c @@ -2,7 +2,7 @@ * Routines for AJP13 dissection * Copyright 2002, Christopher K. St. John * - * $Id: packet-ajp13.c,v 1.5 2002/06/29 00:05:05 guy Exp $ + * $Id: packet-ajp13.c,v 1.6 2002/07/17 00:42:40 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -41,10 +41,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include #include #include "packet-tcp.h" diff --git a/packet-bacapp.c b/packet-bacapp.c index 7571188e6a..8c4dc433f7 100644 --- a/packet-bacapp.c +++ b/packet-bacapp.c @@ -2,7 +2,7 @@ * Routines for BACnet (APDU) dissection * Copyright 2001, Hartmut Mueller , FH Dortmund * - * $Id: packet-bacapp.c,v 1.10 2002/01/24 09:20:47 guy Exp $ + * $Id: packet-bacapp.c,v 1.11 2002/07/17 00:42:40 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -43,10 +43,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include static const char* diff --git a/packet-bacnet.c b/packet-bacnet.c index 692e8db36d..7e7788c981 100644 --- a/packet-bacnet.c +++ b/packet-bacnet.c @@ -2,7 +2,7 @@ * Routines for BACnet (NPDU) dissection * Copyright 2001, Hartmut Mueller , FH Dortmund * - * $Id: packet-bacnet.c,v 1.11 2002/05/30 02:04:43 guy Exp $ + * $Id: packet-bacnet.c,v 1.12 2002/07/17 00:42:40 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -43,10 +43,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include static dissector_handle_t bacapp_handle; diff --git a/packet-bvlc.c b/packet-bvlc.c index edeffab5bf..232a60fca2 100644 --- a/packet-bvlc.c +++ b/packet-bvlc.c @@ -2,7 +2,7 @@ * Routines for BACnet/IP (BVLL, BVLC) dissection * Copyright 2001, Hartmut Mueller , FH Dortmund * - * $Id: packet-bvlc.c,v 1.10 2002/06/05 00:03:06 gerald Exp $ + * $Id: packet-bvlc.c,v 1.11 2002/07/17 00:42:40 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -45,10 +45,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include static int proto_bvlc = -1; diff --git a/packet-gmrp.c b/packet-gmrp.c index bc93b05dcc..69987436be 100644 --- a/packet-gmrp.c +++ b/packet-gmrp.c @@ -5,7 +5,7 @@ * Based on the code from packet-gvrp.c (GVRP) from * Kevin Shi Copyright 2000 * - * $Id: packet-gmrp.c,v 1.7 2002/06/28 23:59:47 guy Exp $ + * $Id: packet-gmrp.c,v 1.8 2002/07/17 00:42:40 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -44,10 +44,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include #include "llcsaps.h" diff --git a/packet-gnutella.c b/packet-gnutella.c index c10807c1ad..757324fa96 100644 --- a/packet-gnutella.c +++ b/packet-gnutella.c @@ -2,7 +2,7 @@ * Routines for gnutella dissection * Copyright 2001, B. Johannessen * - * $Id: packet-gnutella.c,v 1.12 2002/01/24 09:20:48 guy Exp $ + * $Id: packet-gnutella.c,v 1.13 2002/07/17 00:42:40 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -41,10 +41,6 @@ #include -#ifdef NEED_SNPRINTF_H -#include "snprintf.h" -#endif - #include #include "packet-gnutella.h" diff --git a/packet-gtp.c b/packet-gtp.c index 1cd5e78813..7a55426ddc 100644 --- a/packet-gtp.c +++ b/packet-gtp.c @@ -4,7 +4,7 @@ * Copyright 2001, Michal Melerowicz * Nicolas Balkota * - * $Id: packet-gtp.c,v 1.30 2002/05/29 07:35:54 guy Exp $ + * $Id: packet-gtp.c,v 1.31 2002/07/17 00:42:40 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -43,10 +43,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include #include "packet-ipv6.h" #include "ppptypes.h" diff --git a/packet-gvrp.c b/packet-gvrp.c index 793eb05f60..0a3958bde8 100644 --- a/packet-gvrp.c +++ b/packet-gvrp.c @@ -2,7 +2,7 @@ * Routines for GVRP (GARP VLAN Registration Protocol) dissection * Copyright 2000, Kevin Shi * - * $Id: packet-gvrp.c,v 1.11 2002/05/30 05:26:05 guy Exp $ + * $Id: packet-gvrp.c,v 1.12 2002/07/17 00:42:40 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -41,10 +41,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include #include "llcsaps.h" diff --git a/packet-iapp.c b/packet-iapp.c index 3b1796cc74..8ce7e6bad6 100644 --- a/packet-iapp.c +++ b/packet-iapp.c @@ -2,7 +2,7 @@ * Routines for IAPP dissection * Copyright 2002, Alfred Arnold * - * $Id: packet-iapp.c,v 1.3 2002/05/10 23:20:38 guy Exp $ + * $Id: packet-iapp.c,v 1.4 2002/07/17 00:42:40 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -47,10 +47,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include #include "oui.h" diff --git a/packet-icq.c b/packet-icq.c index 25bafa7ba0..7124b15461 100644 --- a/packet-icq.c +++ b/packet-icq.c @@ -1,7 +1,7 @@ /* packet-icq.c * Routines for ICQ packet disassembly * - * $Id: packet-icq.c,v 1.44 2002/06/04 07:03:44 guy Exp $ + * $Id: packet-icq.c,v 1.45 2002/07/17 00:42:40 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -57,10 +57,6 @@ #include #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include #include diff --git a/packet-ieee80211.c b/packet-ieee80211.c index 57b740296e..102ac0f37c 100644 --- a/packet-ieee80211.c +++ b/packet-ieee80211.c @@ -3,7 +3,7 @@ * Copyright 2000, Axis Communications AB * Inquiries/bugreports should be sent to Johan.Jorgensen@axis.com * - * $Id: packet-ieee80211.c,v 1.70 2002/06/22 23:11:36 guy Exp $ + * $Id: packet-ieee80211.c,v 1.71 2002/07/17 00:42:40 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -50,11 +50,6 @@ #endif #ifdef NEED_SNPRINTF_H -# ifdef HAVE_STDARG_H -# include -# else -# include -# endif # include "snprintf.h" #endif diff --git a/packet-iscsi.c b/packet-iscsi.c index 360cda007b..5b6b40228d 100644 --- a/packet-iscsi.c +++ b/packet-iscsi.c @@ -2,7 +2,7 @@ * Routines for iSCSI dissection * Copyright 2001, Eurologic and Mark Burton * - * $Id: packet-iscsi.c,v 1.34 2002/06/24 07:57:50 guy Exp $ + * $Id: packet-iscsi.c,v 1.35 2002/07/17 00:42:41 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -41,10 +41,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include #include "prefs.h" #include diff --git a/packet-isup.c b/packet-isup.c index ad9380684e..15230a60a0 100644 --- a/packet-isup.c +++ b/packet-isup.c @@ -2,7 +2,7 @@ * Routines for ISUP dissection * Copyright 2001, Martina Obermeier * - * $Id: packet-isup.c,v 1.12 2002/05/02 09:52:20 guy Exp $ + * $Id: packet-isup.c,v 1.13 2002/07/17 00:42:41 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -43,10 +43,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include #include "packet-ip.h" diff --git a/packet-lmp.c b/packet-lmp.c index 19a52b524d..0fa0d42513 100644 --- a/packet-lmp.c +++ b/packet-lmp.c @@ -3,7 +3,7 @@ * * (c) Copyright Ashok Narayanan * - * $Id: packet-lmp.c,v 1.9 2002/06/16 17:08:43 gerald Exp $ + * $Id: packet-lmp.c,v 1.10 2002/07/17 00:42:41 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -55,10 +55,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include #include #include diff --git a/packet-m3ua.c b/packet-m3ua.c index fa1368fa70..f59168730b 100644 --- a/packet-m3ua.c +++ b/packet-m3ua.c @@ -9,7 +9,7 @@ * * Copyright 2000, 2001, 2002, Michael Tuexen * - * $Id: packet-m3ua.c,v 1.18 2002/05/01 00:09:16 guy Exp $ + * $Id: packet-m3ua.c,v 1.19 2002/07/17 00:42:41 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -51,10 +51,6 @@ #include #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include #include "prefs.h" diff --git a/packet-mbtcp.c b/packet-mbtcp.c index b27aa87cc2..3987bb1107 100644 --- a/packet-mbtcp.c +++ b/packet-mbtcp.c @@ -10,7 +10,7 @@ * * for information on Modbus/TCP. * - * $Id: packet-mbtcp.c,v 1.8 2002/01/21 07:36:37 guy Exp $ + * $Id: packet-mbtcp.c,v 1.9 2002/07/17 00:42:41 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -56,10 +56,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include #define DEBUG diff --git a/packet-mip.c b/packet-mip.c index 67db1ba5e9..a3940d58db 100644 --- a/packet-mip.c +++ b/packet-mip.c @@ -2,7 +2,7 @@ * Routines for Mobile IP dissection * Copyright 2000, Stefan Raab * - * $Id: packet-mip.c,v 1.30 2002/05/01 08:17:09 guy Exp $ + * $Id: packet-mip.c,v 1.31 2002/07/17 00:42:41 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -42,10 +42,6 @@ #include #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include /* Initialize the protocol and registered fields */ diff --git a/packet-mmse.c b/packet-mmse.c index 683f6548c7..c474ad5285 100644 --- a/packet-mmse.c +++ b/packet-mmse.c @@ -2,7 +2,7 @@ * Routines for MMS Message Encapsulation dissection * Copyright 2001, Tom Uijldert * - * $Id: packet-mmse.c,v 1.12 2002/06/07 22:50:49 guy Exp $ + * $Id: packet-mmse.c,v 1.13 2002/07/17 00:42:42 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -45,10 +45,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include #include "packet-wap.h" #include "packet-wsp.h" diff --git a/packet-msproxy.c b/packet-msproxy.c index d077e99339..6db109a584 100644 --- a/packet-msproxy.c +++ b/packet-msproxy.c @@ -2,7 +2,7 @@ * Routines for Microsoft Proxy packet dissection * Copyright 2000, Jeffrey C. Foster * - * $Id: packet-msproxy.c,v 1.29 2002/05/01 08:14:32 guy Exp $ + * $Id: packet-msproxy.c,v 1.30 2002/07/17 00:42:42 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -57,10 +57,6 @@ #include #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include #include #include "alignment.h" diff --git a/packet-ranap.c b/packet-ranap.c index da68eec49b..8a6f93c183 100644 --- a/packet-ranap.c +++ b/packet-ranap.c @@ -3,7 +3,7 @@ * Based on 3GPP TS 25.413 V3.4.0 * Copyright 2001, Martin Held * - * $Id: packet-ranap.c,v 1.12 2002/04/14 23:22:21 guy Exp $ + * $Id: packet-ranap.c,v 1.13 2002/07/17 00:42:42 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -45,10 +45,6 @@ #include #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include diff --git a/packet-rmi.c b/packet-rmi.c index e5877bb57a..9e1f9e3b37 100644 --- a/packet-rmi.c +++ b/packet-rmi.c @@ -2,7 +2,7 @@ * Routines for java rmiregistry dissection * Copyright 2002, Michael Stiller * - * $Id: packet-rmi.c,v 1.1 2002/05/29 18:52:26 guy Exp $ + * $Id: packet-rmi.c,v 1.2 2002/07/17 00:42:42 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -41,10 +41,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include #include diff --git a/packet-smpp.c b/packet-smpp.c index 62ac096017..0ea9cb7b9a 100644 --- a/packet-smpp.c +++ b/packet-smpp.c @@ -2,7 +2,7 @@ * Routines for Short Message Peer to Peer dissection * Copyright 2001, Tom Uijldert * - * $Id: packet-smpp.c,v 1.6 2002/03/10 03:08:31 guy Exp $ + * $Id: packet-smpp.c,v 1.7 2002/07/17 00:42:42 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -47,10 +47,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include /* #include "packet-smpp.h" */ /* We autoregister */ diff --git a/packet-socks.c b/packet-socks.c index 2ec57fd5ed..f8e6099488 100644 --- a/packet-socks.c +++ b/packet-socks.c @@ -2,7 +2,7 @@ * Routines for socks versions 4 &5 packet dissection * Copyright 2000, Jeffrey C. Foster * - * $Id: packet-socks.c,v 1.40 2002/06/07 11:37:05 guy Exp $ + * $Id: packet-socks.c,v 1.41 2002/07/17 00:42:42 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -67,10 +67,6 @@ #include #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include #include #include "alignment.h" diff --git a/packet-srvloc.c b/packet-srvloc.c index a0375f95f3..feea3b73e9 100644 --- a/packet-srvloc.c +++ b/packet-srvloc.c @@ -6,7 +6,7 @@ * In particular I have not had an opportunity to see how it * responds to SRVLOC over TCP. * - * $Id: packet-srvloc.c,v 1.30 2002/05/30 08:34:18 guy Exp $ + * $Id: packet-srvloc.c,v 1.31 2002/07/17 00:42:42 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -48,10 +48,6 @@ #include #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include #include diff --git a/packet-ssl.c b/packet-ssl.c index 650e74c21a..23a28ea653 100644 --- a/packet-ssl.c +++ b/packet-ssl.c @@ -2,7 +2,7 @@ * Routines for ssl dissection * Copyright (c) 2000-2001, Scott Renfro * - * $Id: packet-ssl.c,v 1.22 2002/04/11 09:43:22 guy Exp $ + * $Id: packet-ssl.c,v 1.23 2002/07/17 00:42:42 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -62,10 +62,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include #include "prefs.h" diff --git a/packet-sua.c b/packet-sua.c index 03997c4c83..ddaa5788f4 100644 --- a/packet-sua.c +++ b/packet-sua.c @@ -6,7 +6,7 @@ * * Copyright 2000, Michael Tüxen * - * $Id: packet-sua.c,v 1.7 2002/05/30 08:34:19 guy Exp $ + * $Id: packet-sua.c,v 1.8 2002/07/17 00:42:42 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -48,10 +48,6 @@ #include #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include #include "prefs.h" diff --git a/packet-tcp.c b/packet-tcp.c index 086d4b5f37..dbe7c1d277 100644 --- a/packet-tcp.c +++ b/packet-tcp.c @@ -1,7 +1,7 @@ /* packet-tcp.c * Routines for TCP packet disassembly * - * $Id: packet-tcp.c,v 1.145 2002/07/02 08:18:45 guy Exp $ + * $Id: packet-tcp.c,v 1.146 2002/07/17 00:42:42 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -39,10 +39,6 @@ #include #include "in_cksum.h" -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include #include "ipproto.h" #include "follow.h" diff --git a/packet-ucp.c b/packet-ucp.c index c57647ddef..6c9b4bb461 100644 --- a/packet-ucp.c +++ b/packet-ucp.c @@ -2,7 +2,7 @@ * Routines for Universal Computer Protocol dissection * Copyright 2001, Tom Uijldert * - * $Id: packet-ucp.c,v 1.16 2002/06/20 20:17:40 guy Exp $ + * $Id: packet-ucp.c,v 1.17 2002/07/17 00:42:42 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -50,10 +50,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include /* #include "packet-ucp.h" */ /* We autoregister */ diff --git a/packet-wsp.c b/packet-wsp.c index 050bcf9699..b82490792d 100644 --- a/packet-wsp.c +++ b/packet-wsp.c @@ -2,7 +2,7 @@ * * Routines to dissect WSP component of WAP traffic. * - * $Id: packet-wsp.c,v 1.57 2002/06/15 23:23:31 guy Exp $ + * $Id: packet-wsp.c,v 1.58 2002/07/17 00:42:42 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -44,11 +44,6 @@ #endif #ifdef NEED_SNPRINTF_H -# ifdef HAVE_STDARG_H -# include -# else -# include -# endif # include "snprintf.h" #endif diff --git a/packet-wtls.c b/packet-wtls.c index 16b9121b0c..e9d6e9b8cb 100644 --- a/packet-wtls.c +++ b/packet-wtls.c @@ -2,7 +2,7 @@ * * Routines to dissect WTLS component of WAP traffic. * - * $Id: packet-wtls.c,v 1.19 2002/06/15 23:27:15 guy Exp $ + * $Id: packet-wtls.c,v 1.20 2002/07/17 00:42:43 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -43,11 +43,6 @@ #endif #ifdef NEED_SNPRINTF_H -# ifdef HAVE_STDARG_H -# include -# else -# include -# endif # include "snprintf.h" #endif diff --git a/packet-wtp.c b/packet-wtp.c index bb6cbe51ca..5546e84483 100644 --- a/packet-wtp.c +++ b/packet-wtp.c @@ -2,7 +2,7 @@ * * Routines to dissect WTP component of WAP traffic. * - * $Id: packet-wtp.c,v 1.35 2002/06/07 10:11:41 guy Exp $ + * $Id: packet-wtp.c,v 1.36 2002/07/17 00:42:43 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -43,11 +43,6 @@ #endif #ifdef NEED_SNPRINTF_H -# ifdef HAVE_STDARG_H -# include -# else -# include -# endif # include "snprintf.h" #endif diff --git a/plugins/docsis/packet-bpkmattr.c b/plugins/docsis/packet-bpkmattr.c index ae28f57eac..e2baa9e132 100644 --- a/plugins/docsis/packet-bpkmattr.c +++ b/plugins/docsis/packet-bpkmattr.c @@ -43,10 +43,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include /* BPKM Attributes defined in: diff --git a/plugins/docsis/packet-bpkmreq.c b/plugins/docsis/packet-bpkmreq.c index b7db149705..b9898a5f82 100644 --- a/plugins/docsis/packet-bpkmreq.c +++ b/plugins/docsis/packet-bpkmreq.c @@ -43,10 +43,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include /* Initialize the protocol and registered fields */ diff --git a/plugins/docsis/packet-bpkmrsp.c b/plugins/docsis/packet-bpkmrsp.c index 3c0c1bba48..6b220326dd 100644 --- a/plugins/docsis/packet-bpkmrsp.c +++ b/plugins/docsis/packet-bpkmrsp.c @@ -43,10 +43,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include /* Initialize the protocol and registered fields */ diff --git a/plugins/docsis/packet-docsis.c b/plugins/docsis/packet-docsis.c index eccf96ddf1..90ed0a8b51 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.1 2002/07/12 22:52:41 guy Exp $ + * $Id: packet-docsis.c,v 1.2 2002/07/17 00:42:58 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -60,10 +60,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include diff --git a/plugins/docsis/packet-dsaack.c b/plugins/docsis/packet-dsaack.c index 21c5691628..12d6eb6946 100644 --- a/plugins/docsis/packet-dsaack.c +++ b/plugins/docsis/packet-dsaack.c @@ -43,10 +43,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include /* Initialize the protocol and registered fields */ diff --git a/plugins/docsis/packet-dsareq.c b/plugins/docsis/packet-dsareq.c index 21cae0c406..4c6b7808bf 100644 --- a/plugins/docsis/packet-dsareq.c +++ b/plugins/docsis/packet-dsareq.c @@ -43,10 +43,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include /* Initialize the protocol and registered fields */ diff --git a/plugins/docsis/packet-dsarsp.c b/plugins/docsis/packet-dsarsp.c index 18f6f77c08..6d79955e71 100644 --- a/plugins/docsis/packet-dsarsp.c +++ b/plugins/docsis/packet-dsarsp.c @@ -43,10 +43,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include /* Initialize the protocol and registered fields */ diff --git a/plugins/docsis/packet-dscack.c b/plugins/docsis/packet-dscack.c index de78704afd..fabc8f11d3 100644 --- a/plugins/docsis/packet-dscack.c +++ b/plugins/docsis/packet-dscack.c @@ -43,10 +43,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include /* Initialize the protocol and registered fields */ diff --git a/plugins/docsis/packet-dscreq.c b/plugins/docsis/packet-dscreq.c index 466e532ed7..9bb7a64446 100644 --- a/plugins/docsis/packet-dscreq.c +++ b/plugins/docsis/packet-dscreq.c @@ -43,10 +43,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include /* Initialize the protocol and registered fields */ diff --git a/plugins/docsis/packet-dscrsp.c b/plugins/docsis/packet-dscrsp.c index 9fee394e97..9d187d3ef3 100644 --- a/plugins/docsis/packet-dscrsp.c +++ b/plugins/docsis/packet-dscrsp.c @@ -43,10 +43,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include /* Initialize the protocol and registered fields */ diff --git a/plugins/docsis/packet-dsdreq.c b/plugins/docsis/packet-dsdreq.c index 5598d9c4f9..7d29ce65a8 100644 --- a/plugins/docsis/packet-dsdreq.c +++ b/plugins/docsis/packet-dsdreq.c @@ -43,10 +43,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include /* Initialize the protocol and registered fields */ diff --git a/plugins/docsis/packet-dsdrsp.c b/plugins/docsis/packet-dsdrsp.c index bf3dfab474..c06a37688f 100644 --- a/plugins/docsis/packet-dsdrsp.c +++ b/plugins/docsis/packet-dsdrsp.c @@ -43,10 +43,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include /* Initialize the protocol and registered fields */ diff --git a/plugins/docsis/packet-macmgmt.c b/plugins/docsis/packet-macmgmt.c index c978b7a9ae..1cd0c0e858 100644 --- a/plugins/docsis/packet-macmgmt.c +++ b/plugins/docsis/packet-macmgmt.c @@ -44,10 +44,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include #define MGT_SYNC 1 diff --git a/plugins/docsis/packet-map.c b/plugins/docsis/packet-map.c index c167ebebd0..78c2a7fb93 100644 --- a/plugins/docsis/packet-map.c +++ b/plugins/docsis/packet-map.c @@ -44,10 +44,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include #define IUC_REQUEST 1 diff --git a/plugins/docsis/packet-regack.c b/plugins/docsis/packet-regack.c index 90eac4cd54..8763d031e9 100644 --- a/plugins/docsis/packet-regack.c +++ b/plugins/docsis/packet-regack.c @@ -43,10 +43,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include /* Initialize the protocol and registered fields */ diff --git a/plugins/docsis/packet-regreq.c b/plugins/docsis/packet-regreq.c index 7cdd546946..80f6aa6dc3 100644 --- a/plugins/docsis/packet-regreq.c +++ b/plugins/docsis/packet-regreq.c @@ -43,10 +43,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include /* Initialize the protocol and registered fields */ diff --git a/plugins/docsis/packet-regrsp.c b/plugins/docsis/packet-regrsp.c index 851304c305..6d6b025b21 100644 --- a/plugins/docsis/packet-regrsp.c +++ b/plugins/docsis/packet-regrsp.c @@ -43,10 +43,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include /* Initialize the protocol and registered fields */ diff --git a/plugins/docsis/packet-rngreq.c b/plugins/docsis/packet-rngreq.c index 540d5fa6f6..76625ea627 100644 --- a/plugins/docsis/packet-rngreq.c +++ b/plugins/docsis/packet-rngreq.c @@ -44,10 +44,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include diff --git a/plugins/docsis/packet-rngrsp.c b/plugins/docsis/packet-rngrsp.c index e21b7f21af..27b5077d90 100644 --- a/plugins/docsis/packet-rngrsp.c +++ b/plugins/docsis/packet-rngrsp.c @@ -43,10 +43,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include #define RNGRSP_TIMING 1 diff --git a/plugins/docsis/packet-tlv.c b/plugins/docsis/packet-tlv.c index 21791fed87..919d7d6961 100644 --- a/plugins/docsis/packet-tlv.c +++ b/plugins/docsis/packet-tlv.c @@ -44,10 +44,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include #include "packet-tlv.h" diff --git a/plugins/docsis/packet-uccreq.c b/plugins/docsis/packet-uccreq.c index d6ba08a075..7c33750622 100644 --- a/plugins/docsis/packet-uccreq.c +++ b/plugins/docsis/packet-uccreq.c @@ -43,10 +43,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include /* Initialize the protocol and registered fields */ diff --git a/plugins/docsis/packet-uccrsp.c b/plugins/docsis/packet-uccrsp.c index 448e18cdb3..d26d51da0f 100644 --- a/plugins/docsis/packet-uccrsp.c +++ b/plugins/docsis/packet-uccrsp.c @@ -43,10 +43,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include /* Initialize the protocol and registered fields */ diff --git a/plugins/docsis/packet-ucd.c b/plugins/docsis/packet-ucd.c index 8a85aed6c2..5b2dad9810 100644 --- a/plugins/docsis/packet-ucd.c +++ b/plugins/docsis/packet-ucd.c @@ -45,10 +45,6 @@ #include -#ifdef NEED_SNPRINTF_H -# include "snprintf.h" -#endif - #include #define UCD_SYMBOL_RATE 1 diff --git a/plugins/giop/packet-coseventcomm.c b/plugins/giop/packet-coseventcomm.c index 2e09f67273..eea3ec329f 100644 --- a/plugins/giop/packet-coseventcomm.c +++ b/plugins/giop/packet-coseventcomm.c @@ -49,15 +49,6 @@ # include #endif -#ifdef NEED_SNPRINTF_H -# ifdef HAVE_STDARG_H -# include -# else -# include -# endif -# include "snprintf.h" -#endif - #include #include #include diff --git a/plugins/giop/packet-cosnaming.c b/plugins/giop/packet-cosnaming.c index 28d2e84180..4dca0299c0 100644 --- a/plugins/giop/packet-cosnaming.c +++ b/plugins/giop/packet-cosnaming.c @@ -49,15 +49,6 @@ # include #endif -#ifdef NEED_SNPRINTF_H -# ifdef HAVE_STDARG_H -# include -# else -# include -# endif -# include "snprintf.h" -#endif - #include #include #include -- cgit v1.2.3