glusterfs: Add support for getvolumeinfo procedure

[metze/wireshark/wip.git] / wireshark-qt.cpp

diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp
index f8fb41becba735829011a0bdf2f905c73b858321..d8703a99c7e2f1e647f9d32c2568494d43ac4abe 100644 (file)
--- a/wireshark-qt.cpp
+++ b/wireshark-qt.cpp
@@ -388,10 +388,10 @@ int main(int argc, char *qt_argv[])
 #ifdef HAVE_LIBPCAP
     int                  caps_queries = 0;
 #endif
-    /* Start time in microseconds*/
-    guint64 start_time = g_get_monotonic_time();
 #ifdef DEBUG_STARTUP_TIME
-    /* At least on Windows there is a problem with the loging as the preferences is taken
+    /* Start time in microseconds */
+    guint64 start_time = g_get_monotonic_time();
+    /* At least on Windows there is a problem with the logging as the preferences is taken
      * into account and the preferences are loaded pretty late in the startup process.
      */
     prefs.console_log_level = DEBUG_STARTUP_TIME_LOGLEVEL;
@@ -625,7 +625,7 @@ int main(int argc, char *qt_argv[])
                         open_failure_alert_box, read_failure_alert_box,
                         write_failure_alert_box);
 
-    wtap_init();
+    wtap_init(TRUE);
 
     splash_update(RA_DISSECTORS, NULL, NULL);
 #ifdef DEBUG_STARTUP_TIME
@@ -696,7 +696,9 @@ int main(int argc, char *qt_argv[])
     splash_update(RA_EXTCAP, NULL, NULL);
     extcap_register_preferences();
     splash_update(RA_PREFERENCES, NULL, NULL);
+#ifdef DEBUG_STARTUP_TIME
     g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_INFO, "Calling module preferences, elapsed time %" G_GUINT64_FORMAT " us \n", g_get_monotonic_time() - start_time);
+#endif
 
     global_commandline_info.prefs_p = ws_app.readConfigurationFiles(false);
 
@@ -861,7 +863,9 @@ int main(int argc, char *qt_argv[])
 #endif /* HAVE_LIBPCAP */
 
     wsApp->allSystemsGo();
+#ifdef DEBUG_STARTUP_TIME
     g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_INFO, "Wireshark is up and ready to go, elapsed time %" G_GUINT64_FORMAT "us \n", g_get_monotonic_time() - start_time);
+#endif
     SimpleDialog::displayQueuedMessages(main_w);
 
     /* User could specify filename, or display filter, or both */