diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Makefile.common | 4 | ||||
| -rw-r--r-- | cfile.h | 2 | ||||
| -rw-r--r-- | epan/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | epan/Makefile.common | 4 | ||||
| -rw-r--r-- | epan/frame_data_sequence.c (renamed from frame_data_sequence.c) | 0 | ||||
| -rw-r--r-- | epan/frame_data_sequence.h (renamed from frame_data_sequence.h) | 10 | ||||
| -rw-r--r-- | epan/packet-range.c (renamed from packet-range.c) | 0 | ||||
| -rw-r--r-- | epan/packet-range.h (renamed from packet-range.h) | 12 | ||||
| -rw-r--r-- | file.c | 1 | ||||
| -rw-r--r-- | file.h | 2 | ||||
| -rw-r--r-- | print.c | 2 | ||||
| -rw-r--r-- | print.h | 2 | ||||
| -rw-r--r-- | ui/gtk/capture_file_dlg.c | 1 | ||||
| -rw-r--r-- | ui/gtk/range_utils.c | 2 | ||||
| -rw-r--r-- | ui/qt/column_preferences_frame.cpp | 1 | ||||
| -rw-r--r-- | ui/qt/module_preferences_scroll_area.h | 1 | ||||
| -rw-r--r-- | ui/qt/packet_range_group_box.h | 2 | ||||
| -rw-r--r-- | ui/qt/preferences_dialog.h | 1 |
19 files changed, 23 insertions, 28 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4961d9fb77..9acf063bde 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -653,9 +653,7 @@ set(WIRESHARK_COMMON_SRC cfutils.c clopts_common.c disabled_protos.c - frame_data_sequence.c frame_tvbuff.c - packet-range.c print.c ps.c svnversion.h diff --git a/Makefile.common b/Makefile.common index ed439c2680..6d189d0921 100644 --- a/Makefile.common +++ b/Makefile.common @@ -51,9 +51,7 @@ SHARK_COMMON_SRC = \ cfutils.c \ clopts_common.c \ disabled_protos.c \ - frame_data_sequence.c \ frame_tvbuff.c \ - packet-range.c \ print.c \ ps.c \ sync_pipe_write.c \ @@ -72,10 +70,8 @@ SHARK_COMMON_INCLUDES = \ disabled_protos.h \ file.h \ fileset.h \ - frame_data_sequence.h \ frame_tvbuff.h \ isprint.h \ - packet-range.h \ print.h \ ps.h \ register.h \ @@ -27,7 +27,7 @@ #include <epan/dfilter/dfilter.h> #include <epan/frame_data.h> -#include "frame_data_sequence.h" +#include <epan/frame_data_sequence.h> #ifdef __cplusplus extern "C" { diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index f4b73b2138..1e3678ba6c 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -1441,6 +1441,7 @@ set(LIBWIRESHARK_FILES filter_expressions.c follow.c frame_data.c + frame_data_sequence.c frequency-utils.c funnel.c gcp.c @@ -1454,6 +1455,7 @@ set(LIBWIRESHARK_FILES next_tvb.c oids.c osi-utils.c + packet-range.c packet.c plugins.c prefs.c diff --git a/epan/Makefile.common b/epan/Makefile.common index 446bdead58..3b93b38073 100644 --- a/epan/Makefile.common +++ b/epan/Makefile.common @@ -54,6 +54,7 @@ LIBWIRESHARK_SRC = \ filter_expressions.c \ follow.c \ frame_data.c \ + frame_data_sequence.c \ frequency-utils.c \ funnel.c \ gcp.c \ @@ -67,6 +68,7 @@ LIBWIRESHARK_SRC = \ next_tvb.c \ oids.c \ osi-utils.c \ + packet-range.c \ packet.c \ plugins.c \ prefs.c \ @@ -184,6 +186,7 @@ LIBWIRESHARK_INCLUDES = \ filesystem.h \ follow.h \ frame_data.h \ + frame_data_sequence.h \ frequency-utils.h \ funnel.h \ garrayfix.h \ @@ -207,6 +210,7 @@ LIBWIRESHARK_INCLUDES = \ oids.h \ osi-utils.h \ oui.h \ + packet-range.h \ packet.h \ packet_info.h \ params.h \ diff --git a/frame_data_sequence.c b/epan/frame_data_sequence.c index 8748038fb7..8748038fb7 100644 --- a/frame_data_sequence.c +++ b/epan/frame_data_sequence.c diff --git a/frame_data_sequence.h b/epan/frame_data_sequence.h index 43017fcc78..bf3611a16f 100644 --- a/frame_data_sequence.h +++ b/epan/frame_data_sequence.h @@ -31,23 +31,23 @@ extern "C" { typedef struct _frame_data_sequence frame_data_sequence; -extern frame_data_sequence *new_frame_data_sequence(void); +WS_DLL_PUBLIC frame_data_sequence *new_frame_data_sequence(void); -extern frame_data *frame_data_sequence_add(frame_data_sequence *fds, +WS_DLL_PUBLIC frame_data *frame_data_sequence_add(frame_data_sequence *fds, frame_data *fdata); /* * Find the frame_data for the specified frame number. */ -extern frame_data *frame_data_sequence_find(frame_data_sequence *fds, +WS_DLL_PUBLIC frame_data *frame_data_sequence_find(frame_data_sequence *fds, guint32 num); /* * Free a frame_data_sequence and all the frame_data structures in it. */ -extern void free_frame_data_sequence(frame_data_sequence *fds); +WS_DLL_PUBLIC void free_frame_data_sequence(frame_data_sequence *fds); -extern void find_and_mark_frame_depended_upon(gpointer data, gpointer user_data); +WS_DLL_PUBLIC void find_and_mark_frame_depended_upon(gpointer data, gpointer user_data); #ifdef __cplusplus diff --git a/packet-range.c b/epan/packet-range.c index dc3391b3da..dc3391b3da 100644 --- a/packet-range.c +++ b/epan/packet-range.c diff --git a/packet-range.h b/epan/packet-range.h index ac9cada687..a1e5d9337c 100644 --- a/packet-range.h +++ b/epan/packet-range.h @@ -96,22 +96,22 @@ typedef enum { } range_process_e; /* init the range structure */ -extern void packet_range_init(packet_range_t *range, capture_file *cf); +WS_DLL_PUBLIC void packet_range_init(packet_range_t *range, capture_file *cf); /* check whether the packet range is OK */ -extern convert_ret_t packet_range_check(packet_range_t *range); +WS_DLL_PUBLIC convert_ret_t packet_range_check(packet_range_t *range); /* init the processing run */ -extern void packet_range_process_init(packet_range_t *range); +WS_DLL_PUBLIC void packet_range_process_init(packet_range_t *range); /* do we have to process all packets? */ -extern gboolean packet_range_process_all(packet_range_t *range); +WS_DLL_PUBLIC gboolean packet_range_process_all(packet_range_t *range); /* do we have to process this packet? */ -extern range_process_e packet_range_process_packet(packet_range_t *range, frame_data *fdata); +WS_DLL_PUBLIC range_process_e packet_range_process_packet(packet_range_t *range, frame_data *fdata); /* convert user given string to the internal user specified range representation */ -extern void packet_range_convert_str(packet_range_t *range, const gchar *es); +WS_DLL_PUBLIC void packet_range_convert_str(packet_range_t *range, const gchar *es); #ifdef __cplusplus } @@ -51,7 +51,6 @@ #include <epan/column.h> #include <epan/packet.h> #include <epan/column-utils.h> -#include "packet-range.h" #include "print.h" #include "file.h" #include "fileset.h" @@ -30,7 +30,7 @@ #include <errno.h> #include <epan/epan.h> -#include "packet-range.h" +#include <epan/packet-range.h> #ifdef __cplusplus extern "C" { @@ -38,7 +38,7 @@ #include <epan/emem.h> #include <epan/expert.h> -#include "packet-range.h" +#include <epan/packet-range.h> #include "print.h" #include "isprint.h" #include "ps.h" @@ -31,7 +31,7 @@ #include <epan/packet.h> -#include "packet-range.h" +#include <epan/packet-range.h> #ifdef __cplusplus extern "C" { diff --git a/ui/gtk/capture_file_dlg.c b/ui/gtk/capture_file_dlg.c index c85e4c3027..6d24dff82c 100644 --- a/ui/gtk/capture_file_dlg.c +++ b/ui/gtk/capture_file_dlg.c @@ -36,7 +36,6 @@ #include <epan/addr_resolv.h> #include <epan/prefs.h> -#include "packet-range.h" #include "globals.h" #include "color.h" #include "color_filters.h" diff --git a/ui/gtk/range_utils.c b/ui/gtk/range_utils.c index 8a51a5bdc8..1a984e9be3 100644 --- a/ui/gtk/range_utils.c +++ b/ui/gtk/range_utils.c @@ -30,7 +30,7 @@ #include "../globals.h" #include "ui/simple_dialog.h" -#include "../packet-range.h" +#include "epan/packet-range.h" #include "ui/gtk/gui_utils.h" #include "ui/gtk/dlg_utils.h" diff --git a/ui/qt/column_preferences_frame.cpp b/ui/qt/column_preferences_frame.cpp index 963c2002fa..8c7ffcca50 100644 --- a/ui/qt/column_preferences_frame.cpp +++ b/ui/qt/column_preferences_frame.cpp @@ -26,7 +26,6 @@ #include <glib.h> #include "color.h" -#include "packet-range.h" #include <epan/column_info.h> #include <epan/column.h> diff --git a/ui/qt/module_preferences_scroll_area.h b/ui/qt/module_preferences_scroll_area.h index f5be4c7c1b..897e558276 100644 --- a/ui/qt/module_preferences_scroll_area.h +++ b/ui/qt/module_preferences_scroll_area.h @@ -29,7 +29,6 @@ #include <glib.h> #include "color.h" -#include "packet-range.h" #include <epan/prefs.h> diff --git a/ui/qt/packet_range_group_box.h b/ui/qt/packet_range_group_box.h index 9d874dea33..371d63dca2 100644 --- a/ui/qt/packet_range_group_box.h +++ b/ui/qt/packet_range_group_box.h @@ -28,7 +28,7 @@ #include <glib.h> -#include "packet-range.h" +#include "epan/packet-range.h" #include "syntax_line_edit.h" #include <QGroupBox> diff --git a/ui/qt/preferences_dialog.h b/ui/qt/preferences_dialog.h index 6c9702bea8..445081b196 100644 --- a/ui/qt/preferences_dialog.h +++ b/ui/qt/preferences_dialog.h @@ -29,7 +29,6 @@ #include <glib.h> #include "color.h" -#include "packet-range.h" #include <epan/prefs.h> |