Move report_err.{h,c} from epan into wsutil: there's nothing epan-specific there...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@50598 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a9e755be528b009bc3f56f7a48db5c2b538853b..367076779b5b7111b9453a5ed154d4d36d2c6fab 100644 (file)
--- 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
 )
 

diff --git a/Makefile.am b/Makefile.am
index 26f17d95808ec281146b30a0714e0a323e096660..f513b43f4effd7d5e2cca91e6a9610b2feddb208 100644 (file)
--- 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

diff --git a/Makefile.nmake b/Makefile.nmake
index 8268ad3783a4f4126468e72f1d427b4deee28756..b151c489884a4735fd25eb31bbf78f85813bc1ac 100644 (file)
--- 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

diff --git a/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c
index bb9d79013ddb5ceb046635fb03bfac8d254648ed..1653f8a4ec4ffc14ad219dcf3ca3769082285214 100644 (file)
--- 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>
 
 

diff --git a/capinfos.c b/capinfos.c
index 5bca75c46b05250cc4639568b41835d489149161..e6da645758c50ef18652b6cd4af656377ce73178 100644 (file)
--- 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>
 

diff --git a/capture_sync.c b/capture_sync.c
index f8a6f83f28b578d31cf4c0a1ddb6bcae282c5e78..04a61a6500e092ef987e7ea4977a67268533c642 100644 (file)
--- 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

diff --git a/editcap.c b/editcap.c
index f0c1adf29f2e01c25fc7ac8b0af4520517a02e35..08a3d29dac21bf2487bf8063f5afdeae673bd7ae 100644 (file)
--- 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
 

diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 0c1c6d369eac460536294e7cfa9f5a740407bf2c..8b8d3efd25ccc64f960bfbb1b237f3172a800105 100644 (file)
--- 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

diff --git a/epan/Makefile.common b/epan/Makefile.common
index df016301f59396d0c76e445a35fe224eaa30a66e..c8a142bb70b3cc126cd705f13e4aa026d4fc0cf5 100644 (file)
--- 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             \

diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c
index 5efb1078c753a0ad7b5c18234e548dde87f8e3e2..f45d2544e7587c8df121fc468bd0a354809d8ca8 100644 (file)
--- 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>
 

diff --git a/epan/dfilter/dfilter-macro.c b/epan/dfilter/dfilter-macro.c
index 782d2d290a4ce840d5d56ac7310e0dfacd5af382..527c753cc7efbfe265a6a16dabd37917675beba4 100644 (file)
--- 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>
 

diff --git a/epan/dfilter/dfilter.c b/epan/dfilter/dfilter.c
index ea48ce8cad4c8d4b9a4bb80f019907d62baea32c..bef5e7ef2574b9630789c0a855ed46a96afc560c 100644 (file)
--- 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
 

diff --git a/epan/dissectors/packet-etch.c b/epan/dissectors/packet-etch.c
index b8c11d58394aca36b705634bc82eb424090a0b53..3a71fc945329e99297e301acd188a0f57db417a9 100644 (file)
--- 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>
 

diff --git a/epan/dissectors/packet-k12.c b/epan/dissectors/packet-k12.c
index 26c5287835f572afb6da46b24b3115e40342a3db..fd3f7aeb7c5e044352bd47bcf954be0f1bdb7206 100644 (file)
--- 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>

diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c
index 4d2e9351556a08f51d60e6ab97224dc0b6fd9f81..928969e02a0b141e10fc3957c28f345e47c79a3d 100644 (file)
--- 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>

diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c
index fda7701c500b33f0391c55b10c853b7c38527f8f..2101fc8f5433ddd962b73a30cf1eb6b281d21cc5 100644 (file)
--- 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>
 
 

diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c
index 0418f398e35f472a4a852b26b84c41e4b4e8f6d1..1009ab1190c3f4d9dbf548d3c8c7515e9fbb6864 100644 (file)
--- 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"

diff --git a/epan/dissectors/packet-xml.c b/epan/dissectors/packet-xml.c
index 4783918f2b7c0ab276965104b19af54b192d47fe..495b9ab2e1992ccf949116842767eb7f5cdb7aff 100644 (file)
--- 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>

diff --git a/epan/epan.c b/epan/epan.c
index 554e86e2ea567d160cfc11c3691bd93b3fb5b96d..023d580436f61ac90ef95cd29fac1409ac850975 100644 (file)
--- 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"

diff --git a/epan/filesystem.c b/epan/filesystem.c
index 9562ca1dee850e4c018b0db5cfa8f50a4a13c76c..1932680ec3226cd4e44b70d9f293e8545d9a9f8e 100644 (file)
--- 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>
 

diff --git a/epan/geoip_db.c b/epan/geoip_db.c
index 962a2b3a4978c29d8cde68fa66f2d9457aeb37ca..5f621cade566c6de3d2c03f405eeba184e97eab6 100644 (file)
--- 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 */

diff --git a/epan/oids.c b/epan/oids.c
index 0f29461ab98325de2cb6b95e50d29f66b1b4c51a..a581149ecc4470789a580a1e9a31d29d3531bb15 100644 (file)
--- 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"
 

diff --git a/epan/plugins.c b/epan/plugins.c
index 47f6aee2926bbd3053761977fe76c62da2b956db..c5995b84e5e19dcfd123aa90edb1e7b675444953 100644 (file)
--- 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;

diff --git a/epan/uat.c b/epan/uat.c
index ebe11c99b6d66766a23b0d22ad2dbebce97f6540..2bbc7f77b8dffe2ec9df64cc4d34226c5bcad4d9 100644 (file)
--- 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>

diff --git a/epan/wslua/wslua.h b/epan/wslua/wslua.h
index d761c4830a69e10101f92f1afbd6e4eba47b0937..0c1870e16ff245d36722b69a746335f26004d816 100644 (file)
--- 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"
 

diff --git a/plugins/asn1/packet-asn1.c b/plugins/asn1/packet-asn1.c
index cdde025bea8549d8867447044c1ea3a7c2024ce5..089f58d00d9c82061a0151358df2904e89a2642a 100644 (file)
--- 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>

diff --git a/plugins/mate/mate.h b/plugins/mate/mate.h
index 3c4db28236a28187497e0e6f241243ab3034dd3a..9c4a7cf09ecb2afa6229c87bfc4c4dc78364e670 100644 (file)
--- 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"
 

diff --git a/plugins/wimaxasncp/packet-wimaxasncp.c b/plugins/wimaxasncp/packet-wimaxasncp.c
index fa07ff21649c1fbb3521527361ac6cc7fdecf924..f16380d7170cc3e3697819ab54f11597a6f68f16 100644 (file)
--- 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"

diff --git a/ui/cli/tap-stats_tree.c b/ui/cli/tap-stats_tree.c
index ec6a1657638f4d12858eb7fd2f125c783f70b55e..2861b2394de69c34224d1c98a972ae68195489e5 100644 (file)
--- 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 {

diff --git a/ui/gtk/compare_stat.c b/ui/gtk/compare_stat.c
index 839fc2e9973ea52e57d0dad0df655f8d6fbe97b6..2491264fcf0c465f32d7e6325d0b5fd3664ccbea 100644 (file)
--- 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>
 

diff --git a/ui/gtk/stats_tree_stat.c b/ui/gtk/stats_tree_stat.c
index 8db0f1c502bc8b2ca62f8a796a40aabe2fe6c158..c0df8bc58d79598c51fdd2695519756e1c96b4f0 100644 (file)
--- 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"

diff --git a/ui/gtk/uat_gui.c b/ui/gtk/uat_gui.c
index f649bce5dd566efa28bd444458f30cb322c60b4c..038a5eb81e41aee34258e04f5fa5ab976244590d 100644 (file)
--- 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>

diff --git a/wsutil/Makefile.common b/wsutil/Makefile.common
index e930e69aa51111afac8916e1359cee9c1213f93c..f334d5f95ba22c9a9db8a8d84b31404bfc62a3f8 100644 (file)
--- 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

diff --git a/epan/report_err.c b/wsutil/report_err.c
similarity index 100%
rename from epan/report_err.c
rename to wsutil/report_err.c

diff --git a/epan/report_err.h b/wsutil/report_err.h
similarity index 98%
rename from epan/report_err.h
rename to wsutil/report_err.h
index 130ae25a9671f1157526fffdf88650278ab446f7..158e8a587de4830fdc1efc14d5ad93084718231a 100644 (file)
--- a/epan/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),