Move disabled_protos.{h,c} into epan.

svn path=/trunk/; revision=50521

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

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		\

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

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

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		\

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
 }

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"

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"

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"

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"
 

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"

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"