Move report_err.{h,c} from epan into wsutil: there's nothing epan-specific there and moving it avoids having to recompile the file for use in editcap and capinfos (which don't link against libwireshark).

svn path=/trunk/; revision=50598
2013-07-15 02:48:26 +00:00 · 2013-07-15 02:48:26 +00:00 · 54bb2e7a5c
parent 27059c2804
commit 54bb2e7a5c
35 changed files with 40 additions and 39 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -630,7 +630,6 @@ endif()

 set(WTAP_PLUGIN_SOURCES
 	epan/plugins.c
-	epan/report_err.c
 	epan/filesystem.c
 )

--- a/Makefile.am
+++ b/Makefile.am
@ -308,7 +308,6 @@ plugin_ldadd = $(_CUSTOM_plugin_ldadd_) \

 WTAP_PLUGIN_SOURCES = \
       epan/plugins.c \
-       epan/report_err.c \
       epan/filesystem.c

 else		# HAVE_PLUGINS
--- a/Makefile.nmake
+++ b/Makefile.nmake
@ -55,7 +55,6 @@ PLATFORM_SRC = capture-wpcap.c capture_wpcap_packet.c capture_win_ifnames.c

 WTAP_PLUGIN_SOURCES = \
 	epan/plugins.c \
-	epan/report_err.c \
 	epan/filesystem.c

 include Makefile.common
--- a/asn1/snmp/packet-snmp-template.c
+++ b/asn1/snmp/packet-snmp-template.c
@ -74,7 +74,6 @@
 #include <epan/crypt/sha1.h>
 #include <epan/crypt/md5.h>
 #include <epan/expert.h>
-#include <epan/report_err.h>
 #include <epan/oids.h>


--- a/capinfos.c
+++ b/capinfos.c
@ -85,14 +85,13 @@
 */
 #define WS_BUILD_DLL
 #define RESET_SYMBOL_EXPORT
-#include <epan/packet.h>
 #include <epan/filesystem.h>
 #include <epan/plugins.h>
-#include <epan/report_err.h>
 #undef WS_BUILD_DLL
 #define RESET_SYMBOL_EXPORT

 #include "wtap.h"
+#include <wsutil/report_err.h>
 #include <wsutil/privileges.h>
 #include <wsutil/str_util.h>

--- a/capture_sync.c
+++ b/capture_sync.c
@ -85,7 +85,6 @@
 #include "globals.h"
 #include "file.h"
 #include <epan/filesystem.h>
-#include <epan/report_err.h>

 #include "capture.h"
 #include "capture_sync.h"
@ -99,6 +98,7 @@
 #include "ui/ui_util.h"

 #include <wsutil/file_util.h>
+#include <wsutil/report_err.h>
 #include "log.h"

 #ifdef _WIN32
--- a/editcap.c
+++ b/editcap.c
@ -76,6 +76,7 @@
 #endif

 #include <wsutil/privileges.h>
+#include "wsutil/report_err.h"

 /*
 * The symbols declared in the below are exported from libwireshark,
@ -87,10 +88,8 @@
 #define RESET_SYMBOL_EXPORT /* wsutil/wsgetopt.h set export behavior above. */
 #include "epan/crypt/md5.h"
 #include "epan/plugins.h"
-#include "epan/report_err.h"
 #include "epan/filesystem.h"
 #include "epan/strnatcmp.h"
-#include "wsutil/nstime.h"
 #undef WS_BUILD_DLL
 #define RESET_SYMBOL_EXPORT

--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@ -1477,7 +1477,6 @@ set(LIBWIRESHARK_FILES
 	range.c
 	reassemble.c
 	reedsolomon.c
-	report_err.c
 	req_resp_hdrs.c
 	show_exception.c
 	sigcomp_state_hdlr.c
--- a/epan/Makefile.common
+++ b/epan/Makefile.common
@ -78,7 +78,6 @@ LIBWIRESHARK_SRC =		\
 	range.c			\
 	reassemble.c		\
 	reedsolomon.c		\
-	report_err.c		\
 	req_resp_hdrs.c		\
 	show_exception.c	\
 	sigcomp_state_hdlr.c	\
@ -232,7 +231,6 @@ LIBWIRESHARK_INCLUDES =		\
 	range.h			\
 	reassemble.h		\
 	reedsolomon.h		\
-	report_err.h		\
 	req_resp_hdrs.h		\
 	rtp_pt.h		\
 	sctpppids.h		\
--- a/epan/addr_resolv.c
+++ b/epan/addr_resolv.c
@ -118,15 +118,16 @@

 #include <glib.h>

-#include "report_err.h"
 #include "packet.h"
 #include "addr_and_mask.h"
 #include "ipv6-utils.h"
 #include "addr_resolv.h"
 #include "filesystem.h"

-#include <epan/strutil.h>
+#include <wsutil/report_err.h>
 #include <wsutil/file_util.h>
+
+#include <epan/strutil.h>
 #include <epan/prefs.h>
 #include <epan/emem.h>

--- a/epan/dfilter/dfilter-macro.c
+++ b/epan/dfilter/dfilter-macro.c
@ -34,7 +34,6 @@
 #include "dfilter-macro.h"
 #include <epan/emem.h>
 #include <epan/uat-int.h>
-#include <epan/report_err.h>
 #include <epan/proto.h>
 #include <wsutil/file_util.h>

--- a/epan/dfilter/dfilter.c
+++ b/epan/dfilter/dfilter.c
@ -33,7 +33,6 @@
 #include <epan/epan_dissect.h>
 #include "dfilter.h"
 #include "dfilter-macro.h"
-#include <epan/report_err.h>

 #define DFILTER_TOKEN_ID_OFFSET	1

--- a/epan/dissectors/packet-etch.c
+++ b/epan/dissectors/packet-etch.c
@ -38,9 +38,9 @@
 #include <string.h>

 #include <wsutil/file_util.h>
+#include <wsutil/report_err.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include <epan/report_err.h>
 #include <epan/dissectors/packet-tcp.h>
 #include <epan/wmem/wmem.h>

--- a/epan/dissectors/packet-k12.c
+++ b/epan/dissectors/packet-k12.c
@ -32,7 +32,6 @@
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <prefs.h>
-#include <epan/report_err.h>
 #include <epan/emem.h>
 #include <epan/uat.h>
 #include <epan/expert.h>
--- a/epan/dissectors/packet-radius.c
+++ b/epan/dissectors/packet-radius.c
@ -62,9 +62,10 @@

 #include <glib.h>

+#include <wsutil/report_err.h>
+
 #include <epan/packet.h>
 #include <epan/prefs.h>
-#include <epan/report_err.h>
 #include <epan/crypt/md5.h>
 #include <epan/sminmpec.h>
 #include <epan/filesystem.h>
--- a/epan/dissectors/packet-snmp.c
+++ b/epan/dissectors/packet-snmp.c
@ -82,7 +82,6 @@
 #include <epan/crypt/sha1.h>
 #include <epan/crypt/md5.h>
 #include <epan/expert.h>
-#include <epan/report_err.h>
 #include <epan/oids.h>


--- a/epan/dissectors/packet-ssl.c
+++ b/epan/dissectors/packet-ssl.c
@ -103,7 +103,6 @@
 #include <epan/dissectors/packet-ocsp.h>
 #include <epan/tap.h>
 #include <epan/filesystem.h>
-#include <epan/report_err.h>
 #include <epan/expert.h>
 #include "packet-x509if.h"
 #include "packet-ssl.h"
--- a/epan/dissectors/packet-xml.c
+++ b/epan/dissectors/packet-xml.c
@ -39,13 +39,13 @@
 #include <glib.h>

 #include <wsutil/str_util.h>
+#include <wsutil/report_err.h>

 #include <epan/emem.h>
 #include <epan/wmem/wmem.h>
 #include <epan/packet.h>
 #include <epan/tvbparse.h>
 #include <epan/dtd.h>
-#include <epan/report_err.h>
 #include <epan/filesystem.h>
 #include <epan/prefs.h>
 #include <epan/garrayfix.h>
--- a/epan/epan.c
+++ b/epan/epan.c
@ -38,7 +38,7 @@
 #include <glib.h>
 #include "epan.h"
 #include "epan_dissect.h"
-#include "report_err.h"
+#include "wsutil/report_err.h"

 #include "conversation.h"
 #include "circuit.h"
--- a/epan/filesystem.c
+++ b/epan/filesystem.c
@ -68,7 +68,7 @@
 #endif /* _WIN32 */

 #include "filesystem.h"
-#include "report_err.h"
+#include <wsutil/report_err.h>
 #include <wsutil/privileges.h>
 #include <wsutil/file_util.h>

--- a/epan/geoip_db.c
+++ b/epan/geoip_db.c
@ -40,8 +40,9 @@
 #include "geoip_db.h"
 #include "uat.h"
 #include "prefs.h"
-#include "report_err.h"
 #include "value_string.h"
+
+#include <wsutil/report_err.h>
 #include <wsutil/file_util.h>

 /* This needs to match NUM_GEOIP_COLS in hostlist_table.h */
--- a/epan/oids.c
+++ b/epan/oids.c
@ -37,7 +37,6 @@
 #include "prefs.h"
 #include "proto.h"
 #include "packet.h"
-#include "report_err.h"
 #include "filesystem.h"
 #include "dissectors/packet-ber.h"

--- a/epan/plugins.c
+++ b/epan/plugins.c
@ -53,7 +53,7 @@ wslua_plugin *wslua_plugin_list = NULL;
 #include "filesystem.h"
 #include <wsutil/privileges.h>
 #include <wsutil/file_util.h>
-#include "report_err.h"
+#include <wsutil/report_err.h>

 /* linked list of all plugins */
 plugin *plugin_list = NULL;
--- a/epan/uat.c
+++ b/epan/uat.c
@ -39,9 +39,9 @@

 #include <wsutil/file_util.h>
 #include <wsutil/str_util.h>
+#include <wsutil/report_err.h>

 #include <epan/emem.h>
-#include <epan/report_err.h>
 #include <epan/filesystem.h>
 #include <epan/packet.h>
 #include <epan/range.h>
--- a/epan/wslua/wslua.h
+++ b/epan/wslua/wslua.h
@ -38,7 +38,12 @@
 #include <lua.h>
 #include <lualib.h>
 #include <lauxlib.h>
+
 #include <wiretap/wtap.h>
+
+#include <wsutil/report_err.h>
+#include <wsutil/nstime.h>
+
 #include <epan/packet.h>
 #include <epan/strutil.h>
 #include <epan/prefs.h>
@ -46,12 +51,10 @@
 #include <epan/epan_dissect.h>
 #include <epan/tap.h>
 #include <epan/filesystem.h>
-#include <epan/report_err.h>
 #include <epan/emem.h>
 #include <epan/funnel.h>
 #include <epan/tvbparse.h>
 #include <epan/epan.h>
-#include <wsutil/nstime.h>

 #include "declare_wslua.h"

--- a/plugins/asn1/packet-asn1.c
+++ b/plugins/asn1/packet-asn1.c
@ -69,16 +69,17 @@
 #include <glib.h>
 #include <glib/gprintf.h>

+#include <wsutil/report_err.h>
+#include <wsutil/file_util.h>
+
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 #include <epan/prefs.h>
 #include <epan/filesystem.h>
-#include <epan/report_err.h>
 #include <epan/dissectors/packet-tcp.h>
 #include <epan/oids.h>
 #include <epan/emem.h>
 #include <plugins/asn1/asn1.h>
-#include <wsutil/file_util.h>

 #ifdef DISSECTOR_WITH_GUI
 #include <gtk/gtk.h>
--- a/plugins/mate/mate.h
+++ b/plugins/mate/mate.h
@ -41,6 +41,8 @@
 #include <string.h>
 #include <errno.h>

+#include <wsutil/report_err.h>
+
 #include <epan/packet.h>
 #include <epan/strutil.h>
 #include <epan/prefs.h>
@ -48,7 +50,6 @@
 #include <epan/epan_dissect.h>
 #include <epan/tap.h>
 #include <epan/filesystem.h>
-#include <epan/report_err.h>

 #include "mate_util.h"

--- a/plugins/wimaxasncp/packet-wimaxasncp.c
+++ b/plugins/wimaxasncp/packet-wimaxasncp.c
@ -35,6 +35,8 @@

 #include <glib.h>

+#include <wsutil/report_err.h>
+
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/sminmpec.h>
@ -42,7 +44,6 @@
 #include <epan/ipproto.h>
 #include <epan/expert.h>
 #include <epan/filesystem.h>
-#include <epan/report_err.h>
 #include <epan/eap.h>

 #include "wimaxasncp_dict.h"
--- a/ui/cli/tap-stats_tree.c
+++ b/ui/cli/tap-stats_tree.c
@ -28,9 +28,11 @@
 #include <string.h>
 #include <stdio.h>
 #include <glib.h>
+
+#include <wsutil/report_err.h>
+
 #include <epan/stats_tree_priv.h>
 #include <epan/stat_cmd_args.h>
-#include <epan/report_err.h>

 /* actually unused */
 struct _st_node_pres {
--- a/ui/gtk/compare_stat.c
+++ b/ui/gtk/compare_stat.c
@ -41,6 +41,8 @@
 #include <glib.h>
 #include <gtk/gtk.h>

+#include <wsutil/report_err.h>
+
 #include <epan/packet_info.h>
 #include <epan/epan.h>
 #include <epan/epan_dissect.h>
@ -49,7 +51,6 @@
 #include <epan/tap.h>
 #include <epan/emem.h>
 #include <epan/packet.h>
-#include <epan/report_err.h>
 #include <epan/dissectors/packet-ip.h>
 #include <epan/in_cksum.h>

--- a/ui/gtk/stats_tree_stat.c
+++ b/ui/gtk/stats_tree_stat.c
@ -28,8 +28,9 @@

 #include <gtk/gtk.h>

+#include <wsutil/report_err.h>
+
 #include <epan/stats_tree_priv.h>
-#include <epan/report_err.h>

 #include "ui/simple_dialog.h"
 #include "../globals.h"
--- a/ui/gtk/uat_gui.c
+++ b/ui/gtk/uat_gui.c
@ -48,9 +48,10 @@
 # include <gdk/gdkkeysyms-compat.h>
 #endif

+#include <wsutil/report_err.h>
+
 #include <epan/dfilter/dfilter-macro.h>
 #include <epan/emem.h>
-#include <epan/report_err.h>
 #include <epan/proto.h>
 #include <epan/packet.h>
 #include <epan/uat-int.h>
--- a/wsutil/Makefile.common
+++ b/wsutil/Makefile.common
@ -44,6 +44,7 @@ LIBWSUTIL_SRC = 	\
 	nstime.c	\
 	privileges.c	\
 	str_util.c	\
+	report_err.c	\
 	tempfile.c	\
 	type_util.c

@ -63,5 +64,6 @@ LIBWSUTIL_INCLUDES = 	\
 	nstime.h	\
 	privileges.h	\
 	str_util.h	\
+	report_err.h	\
 	tempfile.h	\
 	type_util.h
--- a/wsutil/report_err.c
+++ b/wsutil/report_err.c
--- a/wsutil/report_err.h
+++ b/wsutil/report_err.h
@ -42,7 +42,7 @@ extern "C" {
 /*
 *  Initialize the report err routines
 */
-extern void init_report_err(
+WS_DLL_PUBLIC void init_report_err(
 	void (*report_failure)(const char *, va_list),
 	void (*report_open_failure)(const char *, int, gboolean),
 	void (*report_read_failure)(const char *, int),