aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2016-12-16 09:35:01 -0500
committerMichael Mann <mmann78@netscape.net>2016-12-16 17:28:50 +0000
commit1a57d810423a70563c7d1fae5c956317c242d55c (patch)
tree401e669b9ae43f2eb808ec7c791e04bed8147bfe
parent70c4a0347ca02f5b8f7ed82d33e340e86d0bd533 (diff)
Rename packet-range.[ch] to packet_range.[ch]
The check*.pl scripts presume that files with the prefix "packet-" are dissector files and therefore have different rules than other files. Rather than trying to clarify that more with additional directory information, just make any non-dissector file with "packet-" filename prefix conform if it fails a "dissector specific" check from the scripts. Change-Id: I7cb52e1fad4ea62320492bb690904260f958aeb4 Reviewed-on: https://code.wireshark.org/review/19304 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
-rw-r--r--epan/CMakeLists.txt2
-rw-r--r--epan/Makefile.am4
-rw-r--r--epan/packet_range.c (renamed from epan/packet-range.c)4
-rw-r--r--epan/packet_range.h (renamed from epan/packet-range.h)2
-rw-r--r--epan/print.c2
-rw-r--r--epan/print.h2
-rw-r--r--file.h2
-rw-r--r--ui/qt/capture_file_dialog.cpp2
-rw-r--r--ui/qt/export_dissection_dialog.cpp2
-rw-r--r--ui/qt/packet_range_group_box.h2
10 files changed, 12 insertions, 12 deletions
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index ac30715037..3c1f014cd7 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -132,7 +132,7 @@ set(LIBWIRESHARK_FILES
oids.c
osi-utils.c
oui.c
- packet-range.c
+ packet_range.c
packet.c
print.c
print_stream.c
diff --git a/epan/Makefile.am b/epan/Makefile.am
index a59d9e1b86..74beea88b7 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -95,7 +95,7 @@ LIBWIRESHARK_SRC = \
oids.c \
osi-utils.c \
oui.c \
- packet-range.c \
+ packet_range.c \
packet.c \
prefs.c \
print.c \
@@ -247,7 +247,7 @@ LIBWIRESHARK_INCLUDES = \
oids.h \
osi-utils.h \
oui.h \
- packet-range.h \
+ packet_range.h \
packet.h \
packet_info.h \
params.h \
diff --git a/epan/packet-range.c b/epan/packet_range.c
index daed7f72f9..c688967af3 100644
--- a/epan/packet-range.c
+++ b/epan/packet_range.c
@@ -1,4 +1,4 @@
-/* packet-range.c
+/* packet_range.c
* Packet range routines (save, print, ...)
*
* Dick Gooris <gooris@lucent.com>
@@ -31,7 +31,7 @@
#include <epan/frame_data.h>
-#include "packet-range.h"
+#include "packet_range.h"
/* (re-)calculate the packet counts (except the user specified range) */
static void packet_range_calc(packet_range_t *range) {
diff --git a/epan/packet-range.h b/epan/packet_range.h
index 938b3305ef..500cdc951f 100644
--- a/epan/packet-range.h
+++ b/epan/packet_range.h
@@ -1,4 +1,4 @@
-/* packet-range.h
+/* packet_range.h
* Packet range routines (save, print, ...)
*
* Dick Gooris <gooris@lucent.com>
diff --git a/epan/print.c b/epan/print.c
index a55d16d4b7..355cd8279b 100644
--- a/epan/print.c
+++ b/epan/print.c
@@ -32,7 +32,7 @@
#include <epan/epan_dissect.h>
#include <epan/to_str.h>
#include <epan/expert.h>
-#include <epan/packet-range.h>
+#include <epan/packet_range.h>
#include <epan/prefs.h>
#include <epan/print.h>
#include <epan/charsets.h>
diff --git a/epan/print.h b/epan/print.h
index dc2c7ad081..63d3be6932 100644
--- a/epan/print.h
+++ b/epan/print.h
@@ -32,7 +32,7 @@
#include <epan/print_stream.h>
-#include <epan/packet-range.h>
+#include <epan/packet_range.h>
#include "ws_symbol_export.h"
diff --git a/file.h b/file.h
index f89bfdc0be..c3c154c484 100644
--- a/file.h
+++ b/file.h
@@ -28,7 +28,7 @@
#include <epan/epan.h>
#include <epan/print.h>
-#include <epan/packet-range.h>
+#include <epan/packet_range.h>
#ifdef __cplusplus
extern "C" {
diff --git a/ui/qt/capture_file_dialog.cpp b/ui/qt/capture_file_dialog.cpp
index 699840e3d9..d41587287e 100644
--- a/ui/qt/capture_file_dialog.cpp
+++ b/ui/qt/capture_file_dialog.cpp
@@ -26,7 +26,7 @@
#ifdef Q_OS_WIN
#include <windows.h>
-#include "epan/packet-range.h"
+#include "epan/packet_range.h"
#include "ui/win32/file_dlg_win32.h"
#else // Q_OS_WIN
diff --git a/ui/qt/export_dissection_dialog.cpp b/ui/qt/export_dissection_dialog.cpp
index 306da411fd..24db5d4923 100644
--- a/ui/qt/export_dissection_dialog.cpp
+++ b/ui/qt/export_dissection_dialog.cpp
@@ -23,7 +23,7 @@
#ifdef Q_OS_WIN
#include <windows.h>
-#include "epan/packet-range.h"
+#include "epan/packet_range.h"
#include "ui/win32/file_dlg_win32.h"
#else // Q_OS_WIN
diff --git a/ui/qt/packet_range_group_box.h b/ui/qt/packet_range_group_box.h
index f131416a1f..769f75fc38 100644
--- a/ui/qt/packet_range_group_box.h
+++ b/ui/qt/packet_range_group_box.h
@@ -26,7 +26,7 @@
#include <glib.h>
-#include "epan/packet-range.h"
+#include "epan/packet_range.h"
#include "syntax_line_edit.h"
#include <QGroupBox>