Remove the last remnants of U3 support.

Change-Id: Ide4c177e67a77c5f9495b3b4c0f817f40e6dde30
Reviewed-on: https://code.wireshark.org/review/14425
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

5 files changed, 5 insertions, 44 deletions

diff --git a/ui/gtk/file_dlg.c b/ui/gtk/file_dlg.c
index b7ec47adcb..fa7c3f1fd7 100644
--- a/ui/gtk/file_dlg.c
+++ b/ui/gtk/file_dlg.c
@@ -73,9 +73,6 @@ file_selection_new(const gchar *title, GtkWindow *parent,
 {
     GtkWidget *win;
     GtkFileChooserAction gtk_action;
-#ifdef _WIN32
-    char *u3devicedocumentpath;
-#endif
     const gchar *ok_button_text;
 
     switch (action) {
@@ -124,16 +121,9 @@ file_selection_new(const gchar *title, GtkWindow *parent,
 
     /* If we've opened a file before, start out by showing the files in the directory
        in which that file resided. */
-    if (last_open_dir)
+    if (last_open_dir) {
         file_selection_set_current_folder(win, last_open_dir);
-#ifdef _WIN32
-    else {
-        u3devicedocumentpath = getenv_utf8("U3_DEVICE_DOCUMENT_PATH");
-        if(u3devicedocumentpath != NULL)
-            file_selection_set_current_folder(win, u3devicedocumentpath);
-
     }
-#endif
     return win;
 }
 
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index 220d6a5885..42215a4afb 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -63,7 +63,6 @@
 #include <wsutil/file_util.h>
 #include <wsutil/privileges.h>
 #include <wsutil/report_err.h>
-#include <wsutil/u3.h>
 #include <wsutil/ws_diag_control.h>
 #include <wsutil/ws_version_info.h>
 
@@ -2030,11 +2029,6 @@ get_wireshark_runtime_info(GString *str)
     g_string_append(str, ", ");
     get_runtime_airpcap_version(str);
 #endif
-
-    if(u3_active()) {
-        g_string_append(str, ", ");
-        u3_runtime_info(str);
-    }
 }
 
 static e_prefs *
@@ -3348,10 +3342,6 @@ main(int argc, char *argv[])
         main_filter_packets(&cfile, dfilter, FALSE);
     }
 
-
-    /* register our pid if we are being run from a U3 device */
-    u3_register_pid();
-
     profile_store_persconffiles (FALSE);
 
 #ifdef HAVE_GTKOSXAPPLICATION
@@ -3380,9 +3370,6 @@ main(int argc, char *argv[])
     gtk_iface_mon_stop();
 #endif
 
-    /* deregister our pid */
-    u3_deregister_pid();
-
     epan_cleanup();
 
     AirPDcapDestroyContext(&airpdcap_ctx);
diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c
index 76bafd1d8f..bcd9024806 100644
--- a/ui/gtk/main_menubar.c
+++ b/ui/gtk/main_menubar.c
@@ -26,8 +26,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <wsutil/u3.h>
-
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/prefs-int.h>
@@ -4076,10 +4074,7 @@ menu_recent_file_write_all(FILE *rf)
     while (list != NULL) {
         cf_name = (gchar *)list->data;
         if (cf_name) {
-            if(u3_active())
-                fprintf (rf, RECENT_KEY_CAPTURE_FILE ": %s\n", u3_contract_device_path(cf_name));
-            else
-                fprintf (rf, RECENT_KEY_CAPTURE_FILE ": %s\n", cf_name);
+            fprintf (rf, RECENT_KEY_CAPTURE_FILE ": %s\n", cf_name);
         }
         list = g_list_previous(list);
     }
diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp
index c3f027bc62..eaf679aa29 100644
--- a/ui/qt/wireshark_application.cpp
+++ b/ui/qt/wireshark_application.cpp
@@ -183,10 +183,7 @@ extern "C" void menu_recent_file_write_all(FILE *rf) {
         /* get capture filename from the menu item label */
         cf_name = rii.previous()->filename;
         if (cf_name != NULL) {
-//            if(u3_active())
-//                fprintf (rf, RECENT_KEY_CAPTURE_FILE ": %s\n", u3_contract_device_path(cf_name));
-//            else
-                fprintf (rf, RECENT_KEY_CAPTURE_FILE ": %s\n", cf_name.toUtf8().constData());
+            fprintf (rf, RECENT_KEY_CAPTURE_FILE ": %s\n", cf_name.toUtf8().constData());
         }
     }
 }
diff --git a/ui/recent.c b/ui/recent.c
index ac5e204a54..566acabbc8 100644
--- a/ui/recent.c
+++ b/ui/recent.c
@@ -39,7 +39,6 @@
 #include "ui/recent_utils.h"
 #include "ui/simple_dialog.h"
 
-#include <wsutil/u3.h>
 #include <wsutil/file_util.h>
 
 #define RECENT_KEY_MAIN_TOOLBAR_SHOW          "gui.toolbar_main_show"
@@ -846,11 +845,7 @@ write_profile_recent(void)
 
   if (get_last_open_dir() != NULL) {
     fprintf(rf, "\n# Last directory navigated to in File Open dialog.\n");
-
-    if (u3_active())
-      fprintf(rf, RECENT_GUI_FILEOPEN_REMEMBERED_DIR ": %s\n", u3_contract_device_path(get_last_open_dir()));
-    else
-      fprintf(rf, RECENT_GUI_FILEOPEN_REMEMBERED_DIR ": %s\n", get_last_open_dir());
+    fprintf(rf, RECENT_GUI_FILEOPEN_REMEMBERED_DIR ": %s\n", get_last_open_dir());
   }
 
   fclose(rf);
@@ -1112,10 +1107,7 @@ read_set_recent_pair_dynamic(gchar *key, const gchar *value,
     return PREFS_SET_SYNTAX_ERR;
   }
   if (strcmp(key, RECENT_KEY_CAPTURE_FILE) == 0) {
-    if (u3_active())
-      add_menu_recent_capture_file(u3_expand_device_path(value));
-    else
-      add_menu_recent_capture_file(value);
+    add_menu_recent_capture_file(value);
   } else if (strcmp(key, RECENT_KEY_DISPLAY_FILTER) == 0) {
     dfilter_combo_add_recent(value);
   } else if (strcmp(key, RECENT_KEY_CAPTURE_FILTER) == 0) {