Move the filter file reading code to libui.

It doesn't belong in libwireshark, as it doesn't affect dissection, but
it *does* belong in libui, as it's helper code for the UIs.

Change-Id: I8a5e0640a299a08e9ec1917dd253197438ebfdbc
Reviewed-on: https://code.wireshark.org/review/20974
Reviewed-by: Guy Harris <guy@alum.mit.edu>

16 files changed, 18 insertions, 22 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 583f2b68d1..992b0cf572 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1875,7 +1875,6 @@ if( (BUILD_wireshark AND QT_FOUND) OR (BUILD_wireshark_gtk AND GTK_FOUND) )
 		capture_opts.c
 		file.c
 		fileset.c
-		filter_files.c
 		summary.c
 		${SHARK_COMMON_SRC}
 		${PLATFORM_UI_SRC}
@@ -2243,7 +2242,6 @@ if(BUILD_tshark)
 	)
 	set(tshark_FILES
 		capture_opts.c
-		filter_files.c
 		tshark-tap-register.c
 		tshark.c
 		${TSHARK_TAP_SRC}
@@ -2305,7 +2303,6 @@ if(BUILD_sharkd)
 		${APPLE_SYSTEM_CONFIGURATION_LIBRARY}
 	)
 	set(sharkd_FILES
-		filter_files.c
 		sharkd.c
 		sharkd_daemon.c
 		sharkd_session.c
@@ -2478,6 +2475,7 @@ if(BUILD_dumpcap AND PCAP_FOUND)
 		writecap
 		wsutil
 		caputils
+		ui
 		${PCAP_LIBRARIES}
 		${CAP_LIBRARIES}
 		${GLIB2_LIBRARIES}
@@ -2492,7 +2490,6 @@ if(BUILD_dumpcap AND PCAP_FOUND)
 		capture_stop_conditions.c
 		conditions.c
 		dumpcap.c
-		filter_files.c
 		ringbuffer.c
 		sync_pipe_write.c
 		ws_version_info.c
diff --git a/Makefile.am b/Makefile.am
index ab43234aef..150dcb2f1e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -419,7 +419,6 @@ WIRESHARK_COMMON_SRC = \
 	capture_opts.c		\
 	file.c			\
 	fileset.c		\
-	filter_files.c		\
 	summary.c		\
 	ws_version_info.c
 
@@ -427,7 +426,6 @@ WIRESHARK_COMMON_SRC = \
 WIRESHARK_COMMON_INCLUDES = \
 	capture_info.h		\
 	capture_opts.h		\
-	filter_files.h		\
 	globals.h		\
 	log.h			\
 	summary.h		\
@@ -508,7 +506,6 @@ endif
 tshark_SOURCES = \
 	$(SHARK_COMMON_SRC)	\
 	capture_opts.c		\
-	filter_files.c		\
 	tshark.c		\
 	ws_version_info.c
 
@@ -580,7 +577,6 @@ rawshark_LDADD = \
 
 sharkd_SOURCES = \
 	$(SHARK_COMMON_SRC)	\
-	filter_files.c		\
 	sharkd.c		\
 	sharkd.h		\
 	sharkd_daemon.c		\
@@ -722,7 +718,6 @@ dumpcap_SOURCES = \
 	capture_stop_conditions.c	\
 	conditions.c			\
 	dumpcap.c			\
-	filter_files.c			\
 	ringbuffer.c			\
 	sync_pipe_write.c		\
 	ws_version_info.c
@@ -736,6 +731,7 @@ dumpcap_LDFLAGS = $(AM_LDFLAGS) $(PIE_LDFLAGS)
 # Libraries with which to link dumpcap.
 dumpcap_LDADD = \
 	caputils/libcaputils.a		\
+	ui/libui.a			\
 	writecap/libwritecap.a		\
 	wsutil/libwsutil.la		\
 	@GLIB_LIBS@			\
diff --git a/capture_opts.c b/capture_opts.c
index 3b0f77c99e..69a24579c2 100644
--- a/capture_opts.c
+++ b/capture_opts.c
@@ -43,7 +43,7 @@
 #include "caputils/capture_ifinfo.h"
 #include "caputils/capture-pcap-util.h"
 
-#include "filter_files.h"
+#include "ui/filter_files.h"
 
 static gboolean capture_opts_output_to_pipe(const char *save_file, gboolean *is_pipe);
 
diff --git a/sharkd.c b/sharkd.c
index 3b10167338..30df444d84 100644
--- a/sharkd.c
+++ b/sharkd.c
@@ -59,9 +59,9 @@
 #include "ui/util.h"
 #include "ui/ui_util.h"
 #include "ui/decode_as_utils.h"
+#include "ui/filter_files.h"
 #include "ui/tap_export_pdu.h"
 #include "register.h"
-#include "filter_files.h"
 #include <epan/epan_dissect.h>
 #include <epan/tap.h>
 
diff --git a/tshark.c b/tshark.c
index b3149cb6a3..19af646675 100644
--- a/tshark.c
+++ b/tshark.c
@@ -84,6 +84,7 @@
 #include "ui/util.h"
 #include "ui/ui_util.h"
 #include "ui/decode_as_utils.h"
+#include "ui/filter_files.h"
 #include "ui/cli/tshark-tap.h"
 #include "ui/cli/tap-exportobject.h"
 #include "ui/tap_export_pdu.h"
@@ -95,7 +96,6 @@
 #include "epan/geoip_db.h"
 #endif
 #include "register.h"
-#include "filter_files.h"
 #include <epan/epan_dissect.h>
 #include <epan/tap.h>
 #include <epan/stat_tap_ui.h>
diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
index 5bd5ec051c..b15a4dcf21 100644
--- a/ui/CMakeLists.txt
+++ b/ui/CMakeLists.txt
@@ -31,6 +31,7 @@ set(COMMON_UI_SRC
 	export_object_ui.c
 	export_pdu_ui_utils.c
 	help_url.c
+	filter_files.c
 	firewall_rules.c
 	iface_lists.c
 	io_graph_item.c
diff --git a/ui/Makefile.am b/ui/Makefile.am
index 3507f9acbd..58166e1812 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -57,6 +57,7 @@ WIRESHARK_UI_SRC = \
 	dissect_opts.c		\
 	export_object_ui.c	\
 	export_pdu_ui_utils.c	\
+	filter_files.c		\
 	firewall_rules.c	\
 	iface_lists.c		\
 	io_graph_item.c		\
@@ -101,6 +102,7 @@ WIRESHARK_UI_INCLUDES = \
 	export_pdu_ui_utils.h	\
 	last_open_dir.h		\
 	file_dialog.h		\
+	filter_files.h		\
 	help_url.h		\
 	packet_list_utils.h	\
 	firewall_rules.h	\
diff --git a/filter_files.c b/ui/filter_files.c
index c5e8818194..e58072221b 100644
--- a/filter_files.c
+++ b/ui/filter_files.c
@@ -1,4 +1,4 @@
-/* filters.c
+/* filter_files.c
  * Code for reading and writing the filters file.
  *
  * Wireshark - Network traffic analyzer
@@ -32,7 +32,7 @@
 #include <wsutil/filesystem.h>
 #include <wsutil/glib-compat.h>
 
-#include "filter_files.h"
+#include "ui/filter_files.h"
 
 /*
  * Old filter file name.
diff --git a/filter_files.h b/ui/filter_files.h
index 9907fe7513..f953b2f506 100644
--- a/filter_files.h
+++ b/ui/filter_files.h
@@ -1,4 +1,4 @@
-/* filters.h
+/* filter_filess.h
  * Declarations of routines for reading and writing the filters file.
  *
  * Wireshark - Network traffic analyzer
diff --git a/ui/gtk/filter_dlg.c b/ui/gtk/filter_dlg.c
index 9c5ec4c335..7604f078e7 100644
--- a/ui/gtk/filter_dlg.c
+++ b/ui/gtk/filter_dlg.c
@@ -30,7 +30,7 @@
 #include <epan/prefs.h>
 #include <epan/column-info.h>
 
-#include "filter_files.h"
+#include "ui/filter_files.h"
 #include "ui/simple_dialog.h"
 #include "ui/main_statusbar.h"
 
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index 197610f769..2e0d53a6f7 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -101,7 +101,7 @@
 #include "ui/alert_box.h"
 #include "ui/console.h"
 #include "ui/decode_as_utils.h"
-#include "filter_files.h"
+#include "ui/filter_files.h"
 #include "ui/main_statusbar.h"
 #include "ui/persfilepath_opt.h"
 #include "ui/preference_utils.h"
diff --git a/ui/qt/capture_filter_edit.cpp b/ui/qt/capture_filter_edit.cpp
index 4539e86f03..89e2bd8df4 100644
--- a/ui/qt/capture_filter_edit.cpp
+++ b/ui/qt/capture_filter_edit.cpp
@@ -28,7 +28,7 @@
 #include "capture_opts.h"
 
 #include <ui/capture_globals.h>
-#include <filter_files.h>
+#include <ui/filter_files.h>
 #include <wsutil/utf8_entities.h>
 
 #include "capture_filter_edit.h"
diff --git a/ui/qt/display_filter_edit.cpp b/ui/qt/display_filter_edit.cpp
index 15fec4aab5..97b035fc5d 100644
--- a/ui/qt/display_filter_edit.cpp
+++ b/ui/qt/display_filter_edit.cpp
@@ -25,7 +25,7 @@
 
 #include <epan/dfilter/dfilter.h>
 
-#include <filter_files.h>
+#include <ui/filter_files.h>
 
 #include <wsutil/utf8_entities.h>
 
diff --git a/ui/qt/field_filter_edit.cpp b/ui/qt/field_filter_edit.cpp
index 8a67f67825..21e2bd8a5a 100644
--- a/ui/qt/field_filter_edit.cpp
+++ b/ui/qt/field_filter_edit.cpp
@@ -25,7 +25,7 @@
 
 #include <epan/dfilter/dfilter.h>
 
-#include <filter_files.h>
+#include <ui/filter_files.h>
 
 #include <wsutil/utf8_entities.h>
 
diff --git a/ui/qt/filter_dialog.cpp b/ui/qt/filter_dialog.cpp
index 0c211d0ce4..9652a327dc 100644
--- a/ui/qt/filter_dialog.cpp
+++ b/ui/qt/filter_dialog.cpp
@@ -25,7 +25,7 @@
 
 #include <glib.h>
 
-#include <filter_files.h>
+#include <ui/filter_files.h>
 
 #include <wsutil/filesystem.h>
 
diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp
index a9428d534f..7f25a2138f 100644
--- a/ui/qt/wireshark_application.cpp
+++ b/ui/qt/wireshark_application.cpp
@@ -65,7 +65,7 @@
 #endif
 
 #include "ui/capture.h"
-#include "filter_files.h"
+#include "ui/filter_files.h"
 #include "ui/capture_globals.h"
 #include "ui/software_update.h"
 #include "ui/last_open_dir.h"