aboutsummaryrefslogtreecommitdiffstats
path: root/tshark.c
diff options
context:
space:
mode:
authorDario Lombardo <lomato@gmail.com>2016-05-03 18:40:17 +0200
committerAnders Broman <a.broman58@gmail.com>2016-06-17 15:38:03 +0000
commit2e9f3c5d366eaa7139fc877b5301392166b3f985 (patch)
treeac2d04b7cc1b8d6c8962d437584e351fcf1bf450 /tshark.c
parent2aa55a387a87cd4f740aea661ca1ca535cd2e392 (diff)
tap: change glib functions to wmem.
Change-Id: I878ae6b121a669f9b7f4e1e57bc079f0cb44c0bf Reviewed-on: https://code.wireshark.org/review/15270 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'tshark.c')
-rw-r--r--tshark.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/tshark.c b/tshark.c
index af38ab0702..3df60d4dd5 100644
--- a/tshark.c
+++ b/tshark.c
@@ -1196,14 +1196,8 @@ main(int argc, char *argv[])
init_open_routines();
#ifdef HAVE_PLUGINS
- /* Register all the plugin types we have. */
- epan_register_plugin_types(); /* Types known to libwireshark */
wtap_register_plugin_types(); /* Types known to libwiretap */
- /* Scan for plugins. This does *not* call their registration routines;
- that's done later. */
- scan_plugins();
-
/* Register all libwiretap plugin modules. */
register_all_wiretap_modules();
#endif