osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Michael Mann 2016-12-16 09:35:01 -05:00
parent 70c4a0347c
commit 1a57d81042
10 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/CMakeLists.txt
View File

@ -132,7 +132,7 @@ set(LIBWIRESHARK_FILES
oids.c oids.c
osi-utils.c osi-utils.c
oui.c oui.c
packet-range.c packet_range.c
packet.c packet.c
print.c print.c
print_stream.c print_stream.c

4
epan/Makefile.am
View File

@ -95,7 +95,7 @@ LIBWIRESHARK_SRC = \
oids.c \ oids.c \
osi-utils.c \ osi-utils.c \
oui.c \ oui.c \
packet-range.c \ packet_range.c \
packet.c \ packet.c \
prefs.c \ prefs.c \
print.c \ print.c \
@ -247,7 +247,7 @@ LIBWIRESHARK_INCLUDES = \
oids.h \ oids.h \
osi-utils.h \ osi-utils.h \
oui.h \ oui.h \
packet-range.h \ packet_range.h \
packet.h \ packet.h \
packet_info.h \ packet_info.h \
params.h \ params.h \

4
epan/packet-range.c → epan/packet_range.c
View File

@ -1,4 +1,4 @@
/* packet-range.c /* packet_range.c
* Packet range routines (save, print, ...) * Packet range routines (save, print, ...)
* *
* Dick Gooris <gooris@lucent.com> * Dick Gooris <gooris@lucent.com>
@ -31,7 +31,7 @@
#include <epan/frame_data.h> #include <epan/frame_data.h>
#include "packet-range.h" #include "packet_range.h"
/* (re-)calculate the packet counts (except the user specified range) */ /* (re-)calculate the packet counts (except the user specified range) */
static void packet_range_calc(packet_range_t *range) { static void packet_range_calc(packet_range_t *range) {

2
epan/packet-range.h → epan/packet_range.h
View File

@ -1,4 +1,4 @@
/* packet-range.h /* packet_range.h
* Packet range routines (save, print, ...) * Packet range routines (save, print, ...)
* *
* Dick Gooris <gooris@lucent.com> * Dick Gooris <gooris@lucent.com>

2
epan/print.c
View File

@ -32,7 +32,7 @@
#include <epan/epan_dissect.h> #include <epan/epan_dissect.h>
#include <epan/to_str.h> #include <epan/to_str.h>
#include <epan/expert.h> #include <epan/expert.h>
#include <epan/packet-range.h> #include <epan/packet_range.h>
#include <epan/prefs.h> #include <epan/prefs.h>
#include <epan/print.h> #include <epan/print.h>
#include <epan/charsets.h> #include <epan/charsets.h>

2
epan/print.h
View File

@ -32,7 +32,7 @@
#include <epan/print_stream.h> #include <epan/print_stream.h>
#include <epan/packet-range.h> #include <epan/packet_range.h>
#include "ws_symbol_export.h" #include "ws_symbol_export.h"

2
file.h
View File

@ -28,7 +28,7 @@
#include <epan/epan.h> #include <epan/epan.h>
#include <epan/print.h> #include <epan/print.h>
#include <epan/packet-range.h> #include <epan/packet_range.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

2
ui/qt/capture_file_dialog.cpp
View File

@ -26,7 +26,7 @@
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#include <windows.h> #include <windows.h>
#include "epan/packet-range.h" #include "epan/packet_range.h"
#include "ui/win32/file_dlg_win32.h" #include "ui/win32/file_dlg_win32.h"
#else // Q_OS_WIN #else // Q_OS_WIN

2
ui/qt/export_dissection_dialog.cpp
View File

@ -23,7 +23,7 @@
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#include <windows.h> #include <windows.h>
#include "epan/packet-range.h" #include "epan/packet_range.h"
#include "ui/win32/file_dlg_win32.h" #include "ui/win32/file_dlg_win32.h"
#else // Q_OS_WIN #else // Q_OS_WIN

2
ui/qt/packet_range_group_box.h
View File

@ -26,7 +26,7 @@
#include <glib.h> #include <glib.h>
#include "epan/packet-range.h" #include "epan/packet_range.h"
#include "syntax_line_edit.h" #include "syntax_line_edit.h"
#include <QGroupBox> #include <QGroupBox>