Move ui/filter_files.[ch] to wsutil

capture_opts.c

@@ -35,12 +35,11 @@
 #include <wsutil/file_util.h>
 #include <wsutil/ws_pipe.h>
 #include <wsutil/ws_assert.h>
+#include <wsutil/filter_files.h>
 
 #include "capture/capture_ifinfo.h"
 #include "capture/capture-pcap-util.h"
 
-#include "ui/filter_files.h"
-
 static gboolean capture_opts_output_to_pipe(const char *save_file, gboolean *is_pipe);
 
 

sharkd.c

@@ -46,7 +46,7 @@
 #include "ui/util.h"
 #include "ui/ws_ui_util.h"
 #include "ui/decode_as_utils.h"
-#include "ui/filter_files.h"
+#include "wsutil/filter_files.h"
 #include "ui/tap_export_pdu.h"
 #include "ui/failure_message.h"
 #include "wtap.h"

tshark.c

@@ -74,7 +74,7 @@
 #include "ui/util.h"
 #include "ui/ws_ui_util.h"
 #include "ui/decode_as_utils.h"
-#include "ui/filter_files.h"
+#include "wsutil/filter_files.h"
 #include "ui/cli/tshark-tap.h"
 #include "ui/cli/tap-exportobject.h"
 #include "ui/tap_export_pdu.h"

ui/CMakeLists.txt

@@ -18,7 +18,6 @@ set(NONGENERATED_UI_SRC
 	help_url.c
 	failure_message.c
 	file_dialog.c
-	filter_files.c
 	firewall_rules.c
 	iface_toolbar.c
 	iface_lists.c

ui/qt/filter_dialog.cpp

@@ -13,8 +13,7 @@
 
 #include <glib.h>
 
-#include <ui/filter_files.h>
+#include <wsutil/filter_files.h>
-
 #include <wsutil/filesystem.h>
 
 #include "filter_dialog.h"

ui/qt/main_application.cpp

@@ -52,7 +52,7 @@
 #include <capture/iface_monitor.h>
 #endif
 
-#include "ui/filter_files.h"
+#include "wsutil/filter_files.h"
 #include "ui/capture_globals.h"
 #include "ui/software_update.h"
 #include "ui/last_open_dir.h"

ui/qt/widgets/capture_filter_edit.cpp

@@ -16,7 +16,7 @@
 #include "capture_opts.h"
 
 #include <ui/capture_globals.h>
-#include <ui/filter_files.h>
+#include <wsutil/filter_files.h>
 #include <wsutil/utf8_entities.h>
 
 #include <ui/qt/widgets/capture_filter_edit.h>

ui/qt/widgets/field_filter_edit.cpp

@@ -13,8 +13,7 @@
 
 #include <epan/dfilter/dfilter.h>
 
-#include <ui/filter_files.h>
+#include <wsutil/filter_files.h>
-
 #include <wsutil/utf8_entities.h>
 
 #include <ui/qt/widgets/field_filter_edit.h>

wsutil/CMakeLists.txt

@@ -123,6 +123,7 @@ set(WSUTIL_COMMON_FILES
 	eax.c
 	feature_list.c
 	filesystem.c
+	filter_files.c
 	g711.c
 	inet_addr.c
 	interface.c

wsutil/filter_files.c

@@ -9,7 +9,8 @@
  */
 
 #include <config.h>
-#define WS_LOG_DOMAIN LOG_DOMAIN_MAIN
+#define WS_LOG_DOMAIN LOG_DOMAIN_WSUTIL
+#include "filter_files.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -23,8 +24,6 @@
 #include <wsutil/wslog.h>
 #include <wsutil/ws_assert.h>
 
-#include "ui/filter_files.h"
-
 /*
  * List of capture filters - saved.
  */

wsutil/filter_files.h

@@ -9,8 +9,10 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
-#ifndef __UI_FILTERS_H__
+#ifndef __FILTER_FILES_H__
-#define __UI_FILTERS_H__
+#define __FILTER_FILES_H__
+
+#include <wireshark.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -52,23 +54,27 @@ typedef struct {
  *
  * On error, report the error via the UI.
  */
+WS_DLL_PUBLIC
 void read_filter_list(filter_list_type_t list_type);
 
 /*
  * Get a pointer to the first entry in a filter list.
  */
+WS_DLL_PUBLIC
 GList *get_filter_list_first(filter_list_type_t list);
 
 /*
  * Add a new filter to the end of a list.
  * Returns a pointer to the newly-added entry.
  */
+WS_DLL_PUBLIC
 GList *add_to_filter_list(filter_list_type_t list, const char *name,
                           const char *expression);
 
 /*
  * Remove a filter from a list.
  */
+WS_DLL_PUBLIC
 void remove_from_filter_list(filter_list_type_t list, GList *fl_entry);
 
 /*
@@ -76,15 +82,17 @@ void remove_from_filter_list(filter_list_type_t list, GList *fl_entry);
  *
  * On error, report the error via the UI.
  */
+WS_DLL_PUBLIC
 void save_filter_list(filter_list_type_t list_type);
 
 /*
  * Free all filter lists
  */
+WS_DLL_PUBLIC
 void free_filter_lists(void);
 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-#endif /* __UI_FILTERS_H__ */
+#endif /* __FILTER_FILES_H__ */