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/giop | |
| 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/giop')
| -rw-r--r-- | plugins/giop/Makefile.nmake | 7 | ||||
| -rw-r--r-- | plugins/giop/packet-coseventcomm.c | 13 | ||||
| -rw-r--r-- | plugins/giop/packet-cosnaming.c | 13 |
3 files changed, 7 insertions, 26 deletions
diff --git a/plugins/giop/Makefile.nmake b/plugins/giop/Makefile.nmake index 333de09bb6..216f8a51c9 100644 --- a/plugins/giop/Makefile.nmake +++ b/plugins/giop/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-cosnaming.obj packet-coseventcomm.obj @@ -30,6 +27,8 @@ coseventcomm.dll coseventcomm.exp coseventcomm.lib : packet-coseventcomm.obj $(L link -dll /out:coseventcomm.dll $(LDFLAGS) packet-coseventcomm.obj $(LINK_PLUGIN_WITH) \ $(GLIB_LIBS) +!ENDIF + clean: rm -f $(OBJECTS) cosnaming.dll cosnaming.exp cosnaming.lib \ coseventcomm.dll coseventcomm.exp coseventcomm.lib *.pdb diff --git a/plugins/giop/packet-coseventcomm.c b/plugins/giop/packet-coseventcomm.c index 6b8e259e1b..110eec0a88 100644 --- a/plugins/giop/packet-coseventcomm.c +++ b/plugins/giop/packet-coseventcomm.c @@ -35,8 +35,6 @@ # include "config.h" #endif -#include "plugins/plugin_api.h" - #include <stdio.h> #include <stdlib.h> #include <gmodule.h> @@ -47,8 +45,6 @@ #include <epan/proto.h> #include <epan/dissectors/packet-giop.h> -#include "plugins/plugin_api_defs.h" - #ifndef ENABLE_STATIC G_MODULE_EXPORT const gchar version[] = "0.0.1"; #endif @@ -868,13 +864,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) +{ if (proto_coseventcomm == -1) { proto_register_giop_coseventcomm(); } diff --git a/plugins/giop/packet-cosnaming.c b/plugins/giop/packet-cosnaming.c index 87c3982c70..44e6229ff8 100644 --- a/plugins/giop/packet-cosnaming.c +++ b/plugins/giop/packet-cosnaming.c @@ -35,8 +35,6 @@ # include "config.h" #endif -#include "plugins/plugin_api.h" - #include <stdio.h> #include <stdlib.h> #include <gmodule.h> @@ -47,8 +45,6 @@ #include <epan/proto.h> #include <epan/dissectors/packet-giop.h> -#include "plugins/plugin_api_defs.h" - #ifndef ENABLE_STATIC G_MODULE_EXPORT const gchar version[] = "0.0.1"; #endif @@ -1746,13 +1742,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) +{ if (proto_cosnaming == -1) { proto_register_giop_cosnaming(); } |