diff options
| author | Laurent Deniel <laurent.deniel@free.fr> | 2000-08-11 13:37:21 +0000 |
|---|---|---|
| committer | Laurent Deniel <laurent.deniel@free.fr> | 2000-08-11 13:37:21 +0000 |
| commit | 6a480953a956a2486e0b618bb02bed56faeac7bf (patch) | |
| tree | 06a0d0c6356d97dfea11180d4ce22f5b278eefd6 /packet-ip.c | |
| parent | 6ad00fc256b351823138519e5a594b3f0f068319 (diff) | |
| download | wireshark-6a480953a956a2486e0b618bb02bed56faeac7bf.tar.gz wireshark-6a480953a956a2486e0b618bb02bed56faeac7bf.tar.bz2 wireshark-6a480953a956a2486e0b618bb02bed56faeac7bf.zip | |
Miscellaneous code cleaning
- add <stdarg.h> or <varargs.h> in snprintf.h
and remove those inclusions in the other #ifdef NEED_SNPRINTF_H codes
- remove the check of multiple inclusions in source (.c) code
(there is a bit loss of _cpp_ performance, but I prefer the gain of
code reading and maintenance; and nowadays, disk caches and VM are
correctly optimized ;-).
- protect all (well almost) header files against multiple inclusions
- add header (i.e. GPL license) in some include files
- reorganize a bit the way header files are included:
First:
#include <system_include_files>
#include <external_package_include_files (e.g. gtk, glib etc.)>
Then
#include "ethereal_include_files"
with the correct HAVE_XXX or NEED_XXX protections.
- add some HAVE_XXX checks before including some system header files
- add the same HAVE_XXX in wiretap as in ethereal
Please forgive me, if I break something (I've only compiled and regression
tested on Linux).
svn path=/trunk/; revision=2254
Diffstat (limited to 'packet-ip.c')
| -rw-r--r-- | packet-ip.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/packet-ip.c b/packet-ip.c index e756c05f2f..bd6ebe3c37 100644 --- a/packet-ip.c +++ b/packet-ip.c @@ -1,7 +1,7 @@ /* packet-ip.c * Routines for IP and miscellaneous IP protocol packet disassembly * - * $Id: packet-ip.c,v 1.100 2000/08/07 03:20:40 guy Exp $ + * $Id: packet-ip.c,v 1.101 2000/08/11 13:35:20 deniel Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -38,19 +38,14 @@ #include <stdio.h> #include <string.h> #include <glib.h> -#include "packet.h" -#include "resolv.h" -#include "prefs.h" #ifdef NEED_SNPRINTF_H -# ifdef HAVE_STDARG_H -# include <stdarg.h> -# else -# include <varargs.h> -# endif # include "snprintf.h" #endif +#include "packet.h" +#include "resolv.h" +#include "prefs.h" #include "etypes.h" #include "ppptypes.h" #include "llcsaps.h" |