aboutsummaryrefslogtreecommitdiffstats
path: root/dfilter.c
diff options
context:
space:
mode:
authorLaurent Deniel <laurent.deniel@free.fr>2000-08-11 13:37:21 +0000
committerLaurent Deniel <laurent.deniel@free.fr>2000-08-11 13:37:21 +0000
commit6a480953a956a2486e0b618bb02bed56faeac7bf (patch)
tree06a0d0c6356d97dfea11180d4ce22f5b278eefd6 /dfilter.c
parent6ad00fc256b351823138519e5a594b3f0f068319 (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 'dfilter.c')
-rw-r--r--dfilter.c26
1 files changed, 2 insertions, 24 deletions
diff --git a/dfilter.c b/dfilter.c
index 1fa0b3932b..ec163e6e64 100644
--- a/dfilter.c
+++ b/dfilter.c
@@ -1,7 +1,7 @@
/* dfilter.c
* Routines for display filters
*
- * $Id: dfilter.c,v 1.36 2000/08/01 18:10:05 gram Exp $
+ * $Id: dfilter.c,v 1.37 2000/08/11 13:35:31 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -31,39 +31,17 @@
# include <sys/types.h>
#endif
-#ifndef _STDIO_H
#include <stdio.h>
-#endif
-
-#ifndef _STRING_H
#include <string.h>
-#endif
+#include <glib.h>
#ifdef NEED_SNPRINTF_H
-# ifdef HAVE_STDARG_H
-# include <stdarg.h>
-# else
-# include <varargs.h>
-# endif
# include "snprintf.h"
#endif
-#ifndef __G_LIB_H__
-#include <glib.h>
-#endif
-
-#ifndef __PROTO_H__
#include "proto.h"
-#endif
-
-#ifndef __DFILTER_H__
#include "dfilter.h"
-#endif
-
-#ifndef __UTIL_H__
#include "util.h"
-#endif
-
#include "dfilter-int.h"
#include "dfilter-grammar.h"