Move disabled_protos.{h,c} into epan.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9acf063bdecc0fcbeb0016d801fae6e59f772e82..b8c8ede595643ec9c1d86d28f422492eb43017ae 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -652,7 +652,6 @@ set(WIRESHARK_COMMON_SRC
        cfile.c
        cfutils.c
        clopts_common.c
-       disabled_protos.c
        frame_tvbuff.c
        print.c
        ps.c

diff --git a/Makefile.common b/Makefile.common
index 6d189d0921febc57674a6bd82689db5f1c1a3aff..6f89e69667bd20e8ea4794b8173655909c515e55 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -50,7 +50,6 @@ SHARK_COMMON_SRC =    \
        cfile.c                 \
        cfutils.c               \
        clopts_common.c         \
-       disabled_protos.c       \
        frame_tvbuff.c          \
        print.c                 \
        ps.c                    \
@@ -67,7 +66,6 @@ SHARK_COMMON_INCLUDES =       \
        clopts_common.h         \
        cmdarg_err.h            \
        color.h                 \
-       disabled_protos.h       \
        file.h                  \
        fileset.h               \
        frame_tvbuff.h          \

diff --git a/echld/echld-int.h b/echld/echld-int.h
index 0c9b58d0a16d05beeb55985c6e079f75b6d3f5cd..ca14f6ba3803033bfb571f22f7e27fb168d0fa73 100644 (file)
--- a/echld/echld-int.h
+++ b/echld/echld-int.h
@@ -73,7 +73,7 @@
 #include "epan/funnel.h"
 #include "epan/prefs.h"
 #include "epan/timestamp.h"
-#include "disabled_protos.h"
+#include "epan/disabled_protos.h"
 #include "echld.h"
 
 #ifdef __cplusplus

diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 1e3678ba6c8b17cb3a7d1f25681eff1d58f234b7..871f5e5a841b5aed6d5c38a609cc3ff7742d62b7 100644 (file)
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -1430,6 +1430,7 @@ set(LIBWIRESHARK_FILES
        crc16-tvb.c
        crc32-tvb.c
        crc8-tvb.c
+       disabled_protos.c
        dissector_filters.c
        emem.c
        epan.c

diff --git a/epan/Makefile.common b/epan/Makefile.common
index 3b93b38073ecc53d5d01203f92ed8257068c5e8e..49eca048dde384f7152b19cd3759ffa5a74f272d 100644 (file)
--- a/epan/Makefile.common
+++ b/epan/Makefile.common
@@ -43,6 +43,7 @@ LIBWIRESHARK_SRC =            \
        crc16-tvb.c             \
        crc32-tvb.c             \
        crc8-tvb.c              \
+       disabled_protos.c       \
        dissector_filters.c     \
        emem.c                  \
        epan.c                  \
@@ -169,6 +170,7 @@ LIBWIRESHARK_INCLUDES =             \
        crc32-tvb.h             \
        crc8-tvb.h              \
        diam_dict.h             \
+       disabled_protos.h       \
        dissector_filters.h     \
        dtd.h                   \
        dtd_parse.h             \

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

diff --git a/disabled_protos.h b/epan/disabled_protos.h
similarity index 85%
rename from disabled_protos.h
rename to epan/disabled_protos.h
index 8fbf9ad6b002ddc2050f9e3ad3602f373578fdc4..dfe17e9d98910fb5ce251f1a4c7c9f6dae1b0ddd 100644 (file)
--- a/disabled_protos.h
+++ b/epan/disabled_protos.h
@@ -47,15 +47,17 @@ typedef struct {
  * or "*read_errno_return" is set to the error if we got an error reading
  * the file.
  */
-void read_disabled_protos_list(char **gpath_return, int *gopen_errno_return,
-                              int *gread_errno_return,
-                              char **path_return, int *open_errno_return,
-                              int *read_errno_return);
+WS_DLL_PUBLIC void
+read_disabled_protos_list(char **gpath_return, int *gopen_errno_return,
+                         int *gread_errno_return,
+                         char **path_return, int *open_errno_return,
+                         int *read_errno_return);
 
 /*
  * Disable protocols as per the stored configuration
  */
-void set_disabled_protos_list(void);
+WS_DLL_PUBLIC void
+set_disabled_protos_list(void);
 
 /*
  * Write out a list of disabled protocols.
@@ -65,7 +67,8 @@ void set_disabled_protos_list(void);
  * the file we tried to read - it should be freed by our caller -
  * and "*errno_return" is set to the error.
  */
-void save_disabled_protos_list(char **pref_path_return, int *errno_return);
+WS_DLL_PUBLIC void
+save_disabled_protos_list(char **pref_path_return, int *errno_return);
 
 #ifdef __cplusplus
 }

diff --git a/rawshark.c b/rawshark.c
index 670b9addba7a95d1eae94b892f414fedd2f5783e..1fe5f31d23bba8b62259a7a7b5952a5926d3c549 100644 (file)
--- a/rawshark.c
+++ b/rawshark.c
@@ -74,7 +74,7 @@
 #include <epan/packet.h>
 #include "file.h"
 #include "frame_tvbuff.h"
-#include "disabled_protos.h"
+#include <epan/disabled_protos.h>
 #include <epan/prefs.h>
 #include <epan/column.h>
 #include "print.h"

diff --git a/tshark.c b/tshark.c
index 0ad094900ca43c99b7fb6ddb0fe0dc99b61de117..d1d6aa8d0b940243628d39cb334ddb877074c662 100644 (file)
--- a/tshark.c
+++ b/tshark.c
@@ -65,7 +65,7 @@
 #include <epan/packet.h>
 #include "file.h"
 #include "frame_tvbuff.h"
-#include "disabled_protos.h"
+#include <epan/disabled_protos.h>
 #include <epan/prefs.h>
 #include <epan/column.h>
 #include "print.h"

diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index ae5e03b82cd9a6ad338b740d30b6c4ac7cfa7d2d..30395d9c9c6d64f146558c71296b434cd899aad0 100644 (file)
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -85,13 +85,13 @@
 #include <epan/stat_cmd_args.h>
 #include <epan/uat.h>
 #include <epan/column.h>
+#include <epan/disabled_protos.h>
 
 /* general (not GTK specific) */
 #include "../file.h"
 #include "../frame_tvbuff.h"
 #include "../summary.h"
 #include "../filters.h"
-#include "../disabled_protos.h"
 #include "../color.h"
 #include "../color_filters.h"
 #include "../print.h"

diff --git a/ui/gtk/proto_dlg.c b/ui/gtk/proto_dlg.c
index f8db18a62fdb46761ea2234e3b4c1715ef910255..983893f3cab4f251f3761214a035bffc3cec0d9d 100644 (file)
--- a/ui/gtk/proto_dlg.c
+++ b/ui/gtk/proto_dlg.c
@@ -34,9 +34,9 @@
 
 #include <epan/prefs.h>
 #include <epan/filesystem.h>
+#include <epan/disabled_protos.h>
 
 #include "ui/util.h"
-#include "../disabled_protos.h"
 
 #include "ui/simple_dialog.h"
 

diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp
index 56df2fc9b95040a90e8736abf28d26de3bd81e9d..28033ecc71640a263c48a96ba8a54b79dffa8e2e 100644 (file)
--- a/ui/qt/main.cpp
+++ b/ui/qt/main.cpp
@@ -63,11 +63,11 @@
 #include <epan/stat_cmd_args.h>
 #include <epan/uat.h>
 #include <epan/column.h>
+#include <epan/disabled_protos.h>
 
 /* general (not Qt specific) */
 #include "file.h"
 #include "summary.h"
-#include "disabled_protos.h"
 #include "color.h"
 #include "color_filters.h"
 #include "print.h"

diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp
index 740aad0606630342d299739b791a68d7c1830321..76c6c6d8c34621b6a9ee33de7d777b67ed42608f 100644 (file)
--- a/ui/qt/wireshark_application.cpp
+++ b/ui/qt/wireshark_application.cpp
@@ -25,6 +25,7 @@
 
 #include <epan/filesystem.h>
 #include <epan/timestamp.h>
+#include <epan/disabled_protos.h>
 
 #include "ui/recent.h"
 #include "ui/simple_dialog.h"
@@ -33,7 +34,6 @@
 
 #include "capture.h"
 #include "color_filters.h"
-#include "disabled_protos.h"
 #include "filters.h"
 #include "log.h"
 #include "recent_file_status.h"