diff options
| author | Lars Roland <Lars.Roland@gmx.net> | 2005-03-05 06:28:10 +0000 |
|---|---|---|
| committer | Lars Roland <Lars.Roland@gmx.net> | 2005-03-05 06:28:10 +0000 |
| commit | 00273300e721999ac67a4ce66dab80fed6a1314f (patch) | |
| tree | ac2c8b87fdd4dc989c3ef1d3b646f7700ba7626c /plugins/irda | |
| parent | 1a7b3ec1439203e3bea3381dfb31b4357758b4c3 (diff) | |
Preparations for dropping the old plugin api.
Introduce a new init routine for plugins,
which does not take the plugin api table as an
argument and allows etheral to distinguish
between plugins using the old and the new api.
Update README.plugins accordingly
Change all g_warnings() in epan/plugins.c to report_failue().
On windows we do not have a log console open while
loading the plugins, because a log console cannot be opened before the prefs have been read. Thus g_warnings()
does not work for reporting problems with plugins.
svn path=/trunk/; revision=13596
Diffstat (limited to 'plugins/irda')
| -rw-r--r-- | plugins/irda/Makefile.nmake | 7 | ||||
| -rw-r--r-- | plugins/irda/packet-ircomm.c | 4 | ||||
| -rw-r--r-- | plugins/irda/packet-irda.c | 13 | ||||
| -rw-r--r-- | plugins/irda/packet-sir.c | 1 |
4 files changed, 5 insertions, 20 deletions
diff --git a/plugins/irda/Makefile.nmake b/plugins/irda/Makefile.nmake index 03b950c988..1a51de7933 100644 --- a/plugins/irda/Makefile.nmake +++ b/plugins/irda/Makefile.nmake @@ -11,12 +11,9 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS) -!IFDEF LINK_PLUGINS_WITH_LIBETHEREAL +!IFDEF ENABLE_LIBETHEREAL LINK_PLUGIN_WITH=..\..\epan\libethereal.lib CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS) -!ELSE -LINK_PLUGIN_WITH=..\plugin_api.obj -!ENDIF OBJECTS=packet-irda.obj packet-ircomm.obj packet-sir.obj @@ -24,6 +21,8 @@ irda.dll irda.exp irda.lib : $(OBJECTS) $(LINK_PLUGIN_WITH) link -dll /out:irda.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) +!ENDIF + clean: rm -f $(OBJECTS) irda.dll irda.exp irda.lib *.pdb diff --git a/plugins/irda/packet-ircomm.c b/plugins/irda/packet-ircomm.c index f2888839ea..0148f89747 100644 --- a/plugins/irda/packet-ircomm.c +++ b/plugins/irda/packet-ircomm.c @@ -28,8 +28,6 @@ # include "config.h" #endif -#include "plugins/plugin_api.h" - #include "moduleinfo.h" #include <stdio.h> @@ -41,8 +39,6 @@ #include <epan/packet.h> #include <epan/proto.h> -#include "plugins/plugin_api_defs.h" - #ifdef NEED_SNPRINTF_H # include "snprintf.h" #endif diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c index 28545d72cf..a87b748d65 100644 --- a/plugins/irda/packet-irda.c +++ b/plugins/irda/packet-irda.c @@ -31,8 +31,6 @@ # include "config.h" #endif -#include "plugins/plugin_api.h" - #include "moduleinfo.h" #include <stdio.h> @@ -46,8 +44,6 @@ #include <epan/conversation.h> #include <epan/xdlc.h> -#include "plugins/plugin_api_defs.h" - #ifdef NEED_SNPRINTF_H # include "snprintf.h" #endif @@ -2343,13 +2339,8 @@ plugin_reg_handoff(void) } G_MODULE_EXPORT void -plugin_init(plugin_address_table_t* pat -#ifndef PLUGINS_NEED_ADDRESS_TABLE -_U_ -#endif -){ - /* initialise the table of pointers needed in Win32 DLLs */ - plugin_address_table_init(pat); +new_plugin_init(void) +{ /* register the new protocol, protocol fields, and subtrees */ if (proto_irlap == -1) { diff --git a/plugins/irda/packet-sir.c b/plugins/irda/packet-sir.c index dd46c9089c..a41904a6a5 100644 --- a/plugins/irda/packet-sir.c +++ b/plugins/irda/packet-sir.c @@ -22,7 +22,6 @@ # include "config.h" #endif #include "moduleinfo.h" -#include "plugins/plugin_api.h" #include <gmodule.h> |