aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2018-08-28 21:39:55 +0100
committerJoão Valverde <j@v6e.pt>2018-08-29 23:22:44 +0000
commit8eddb1650d482f5eecc712967d10bba7450a2f5c (patch)
treefd1cf5b9582e6245ef84db16f9f9cf7081b1b8e6 /ui
parentb6ba314466aa33d97f4da32bb095fc0a566ed2cb (diff)
epan: Remove unnecessary all protocols registration callback
We are exporting a registration function from libwireshark just to have it passed back as a callback. Seems unnecessary. Change-Id: I7621005c9be11691d319102326824c5e3520a6f3 Reviewed-on: https://code.wireshark.org/review/29328 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'ui')
-rw-r--r--ui/qt/about_dialog.cpp1
-rw-r--r--ui/qt/main.cpp3
2 files changed, 1 insertions, 3 deletions
diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp
index a9f42256dc..9d5fa97402 100644
--- a/ui/qt/about_dialog.cpp
+++ b/ui/qt/about_dialog.cpp
@@ -29,7 +29,6 @@
#endif
#include "log.h"
-#include "epan/register.h"
#include "ui/alert_box.h"
#include "ui/last_open_dir.h"
diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp
index ccab602e70..9a6094d311 100644
--- a/ui/qt/main.cpp
+++ b/ui/qt/main.cpp
@@ -618,8 +618,7 @@ int main(int argc, char *qt_argv[])
"-G" flag, as the "-G" flag dumps information registered by the
dissectors, and we must do it before we read the preferences, in
case any dissectors register preferences. */
- if (!epan_init(register_all_protocols,register_all_protocol_handoffs,
- splash_update, NULL)) {
+ if (!epan_init(splash_update, NULL)) {
SimpleDialog::displayQueuedMessages(main_w);
ret_val = INIT_FAILED;
goto clean_exit;