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-socks.c | |
| parent | 6ad00fc256b351823138519e5a594b3f0f068319 (diff) | |
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-socks.c')
| -rw-r--r-- | packet-socks.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/packet-socks.c b/packet-socks.c index 11df2e982c..4f5a2bf8d8 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 <jfoste@woodward.com> * - * $Id: packet-socks.c,v 1.8 2000/08/07 03:21:12 guy Exp $ + * $Id: packet-socks.c,v 1.9 2000/08/11 13:34:59 deniel Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -63,6 +63,11 @@ #include <stdio.h> #include <string.h> #include <glib.h> + +#ifdef NEED_SNPRINTF_H +# include "snprintf.h" +#endif + #include "packet.h" #include "resolv.h" #include "globals.h" @@ -72,16 +77,6 @@ #include "packet-tcp.h" #include "packet-udp.h" -#ifdef NEED_SNPRINTF_H -# ifdef HAVE_STDARG_H -# include <stdarg.h> -# else -# include <varargs.h> -# endif -# include "snprintf.h" -#endif - - #define CHECK_PACKET_LENGTH(X) if (!BYTES_ARE_IN_FRAME(offset, X)){ \ proto_tree_add_text(tree, NullTVB, offset, 0, "*** FRAME TOO SHORT ***"); \ |