Remove support for the old plugin api.

TODO: 
cleanup files in /trunk/plugins

svn path=/trunk/; revision=13782

1 files changed, 7 insertions, 51 deletions

diff --git a/epan/plugins.c b/epan/plugins.c
index dca2d159c8..f9b3e201c0 100644
--- a/epan/plugins.c
+++ b/epan/plugins.c
@@ -59,31 +59,6 @@
 #include "filesystem.h"
 #include "report_err.h"
 
-#ifdef PLUGINS_NEED_ADDRESS_TABLE
-#include "conversation.h"
-#include <epan/reassemble.h>
-#include <epan/prefs.h>
-#include <epan/dissectors/packet-giop.h>
-#include <epan/dissectors/packet-tpkt.h>
-#include <epan/dissectors/packet-tcp.h>
-#include <epan/dissectors/packet-rpc.h>
-#include <epan/tap.h>
-#include <epan/asn1.h>
-#include <epan/dissectors/packet-per.h>
-#include <epan/dissectors/packet-ber.h>
-#include <epan/dissectors/packet-rtp.h>
-#include <epan/dissectors/packet-rtcp.h>
-#include <epan/xdlc.h>
-#include <epan/crc16.h>
-#include "report_err.h"
-#include <epan/dissectors/packet-dcerpc.h>
-#include "plugins/plugin_table.h"
-static plugin_address_table_t	patable = {
-/* file generated by plugin_gen.py */
-#include "plugins/Xass-list"
-};
-#endif
-
 /* linked list of all plugins */
 plugin *plugin_list;
 
@@ -176,7 +151,6 @@ plugins_scan_dir(const char *dirname)
     void         (*register_protoinfo)(void);
     void         (*reg_handoff)(void);
     void         (*register_tap_listener)(void);
-    void         (*init)(void *);
     gchar         *dot;
     int            cr;
 
@@ -305,7 +279,7 @@ plugins_scan_dir(const char *dirname)
 	    }
 
 	    /*
-	     * Do we have an init routine?
+	     * Do we have an old-style init routine?
 	     */
 	    if (g_module_symbol(handle, "plugin_init", &gp))
 	    {
@@ -323,31 +297,24 @@ plugins_scan_dir(const char *dirname)
 		}
 
 		/*
-		 * No - it's an old-style plugin; warn that support for
-		 * old-style plugins will soon be dropped.
+		 * It's just an unsupported old-style plugin;
 		 */
-		report_failure("The plugin %s has an old plugin init routine.\nSupport is going to be dropped in the near future.",
+		report_failure("The plugin %s has an old plugin init routine. Support has been dropped.\n Information on how to update your plugin is available at \nhttp://anonsvn.ethereal.com/ethereal/trunk/doc/README.plugins",
 		    name);
-		init = gp;
-	    }
-	    else
-	    {
-		/*
-		 * No.
-		 */
-		init = NULL;
+		g_module_close(handle);
+		continue;
 	    }
 
 	    /*
 	     * Does this dissector do anything useful?
 	     */
-	    if (init == NULL && register_protoinfo == NULL &&
+	    if (register_protoinfo == NULL &&
 		register_tap_listener == NULL)
 	    {
 		/*
 		 * No.
 		 */
-		report_failure("The plugin %s has neither an init routine, a register routine, or a register_tap_listener routine",
+		report_failure("The plugin %s has neither a register routine, or a register_tap_listener routine",
 		    name);
 		g_module_close(handle);
 		continue;
@@ -379,17 +346,6 @@ plugins_scan_dir(const char *dirname)
 	    if (register_protoinfo != NULL)
 		    register_protoinfo();
 
-	    /*
-	     * Call its init routine, if it has one.
-	     */
-	    if (init != NULL)
-	    {
-#ifdef PLUGINS_NEED_ADDRESS_TABLE
-		    init(&patable);
-#else
-		    init(NULL);
-#endif
-	     }
 	}
 #if GLIB_MAJOR_VERSION < 2
 	closedir(dir);