diff options
author | Guy Harris <guy@alum.mit.edu> | 2001-10-21 21:48:00 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2001-10-21 21:48:00 +0000 |
commit | e980dd9d3bfe00047bc454a2a68d590c2deb37ea (patch) | |
tree | 63b6b1f2a27db0a1dcf8e986ed3441c7c3a0a274 /epan/plugins.c | |
parent | fa928f62c3b9bf3bd69c6e83747f954d7ba1c7ea (diff) | |
download | wireshark-e980dd9d3bfe00047bc454a2a68d590c2deb37ea.tar.gz wireshark-e980dd9d3bfe00047bc454a2a68d590c2deb37ea.tar.bz2 wireshark-e980dd9d3bfe00047bc454a2a68d590c2deb37ea.zip |
Use G_DIR_SEPARATOR_S rather than "/" as a pathname separator in format
strings used to generate pathnames.
Move the definition of PF_DIR from <epan/epan.h> to <epan/filesystem.h>,
so that files requiring only the definition of PF_DIR don't have to
include <epan/epan.h>, and get rid of no-longer-necessary includes of
<epan/epan.h>.
Add a routine to get the directory for "system files" such as
"/etc/ethers" - it's "/etc" on UNIX, and the datafile directory on
Windows (as there's no "/etc" on Windows). Use that to construct the
pathname of the ethers and ipxnet files.
svn path=/trunk/; revision=4056
Diffstat (limited to 'epan/plugins.c')
-rw-r--r-- | epan/plugins.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/epan/plugins.c b/epan/plugins.c index 9594fdcf01..8ad868514c 100644 --- a/epan/plugins.c +++ b/epan/plugins.c @@ -1,7 +1,7 @@ /* plugins.c * plugin routines * - * $Id: plugins.c,v 1.34 2001/09/14 09:27:35 guy Exp $ + * $Id: plugins.c,v 1.35 2001/10/21 21:47:58 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -26,7 +26,6 @@ # include "config.h" #endif -#include <epan.h> #include "plugins.h" #ifdef HAVE_PLUGINS |