diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-08-18 20:17:55 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-08-18 20:17:55 +0000 |
| commit | 200d256cbc21bcea35de530a7ae3c4f637b0e5fa (patch) | |
| tree | 3b7d7e189cd62a8088fbdaf562d725bb7026292d /epan/plugins.c | |
| parent | 0dd974cca96ba4f8923b85939fd7f34035ecab51 (diff) | |
From Matthijs Melchior:
move the initialization of the addresses in the plugin interface
structure from run-time to link time;
don't attempt to rebuild the X* files automatically, just warn
that they're out of date and show the command used to rebuild
them (not everybody has GCC installed, but it's required in
order to rebuild them).
Get rid of the checked-in Xepan_plugins.c, as it's no longer generated
or used.
Fix Makefile.am now that Xepan_plugins.c has been replaced by Xass-list.
Give plugin_gen.py an RCS ID.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@8186 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/plugins.c')
| -rw-r--r-- | epan/plugins.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/epan/plugins.c b/epan/plugins.c index 465c7ba1cc..53ab319e4d 100644 --- a/epan/plugins.c +++ b/epan/plugins.c @@ -1,7 +1,7 @@ /* plugins.c * plugin routines * - * $Id: plugins.c,v 1.74 2003/07/18 03:01:32 guy Exp $ + * $Id: plugins.c,v 1.75 2003/08/18 20:17:52 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -68,7 +68,10 @@ #include "tap.h" #include "asn1.h" #include "plugins/plugin_table.h" -static plugin_address_table_t patable; +static plugin_address_table_t patable = { +/* file generated by plugin_gen.py */ +#include "plugins/Xass-list" +}; #endif /* linked list of all plugins */ @@ -314,12 +317,6 @@ init_plugins(const char *plugin_dir) if (plugin_list == NULL) /* ensure init_plugins is only run once */ { -#ifdef PLUGINS_NEED_ADDRESS_TABLE - /* Intialize address table */ -/* file generated by plugin_gen.py */ -#include "../plugins/Xepan_plugins.c" -#endif - #ifdef WIN32 /* * On Windows, the data file directory is the installation |