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

Rename "ws_version_info.h", also .c 

It's not installed so like most other files it doesn't need or benefit
from the prefix.

Change-Id: I01517e06f12b3101fee21b68cba3bc6842bbef5c
Reviewed-on: https://code.wireshark.org/review/23751
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
This commit is contained in:
João Valverde 2017-09-26 15:04:56 +01:00 committed by João Valverde
parent 221a2bcbd0
commit a269ae1b6a
44 changed files with 73 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.editorconfig
View File

@ -80,6 +80,6 @@ indent_size = tab
indent_style = tab indent_style = tab
indent_size = tab indent_size = tab
[ws_version_info.[ch]] [version_info.[ch]]
indent_style = tab indent_style = tab
indent_size = tab indent_size = tab

4
.gitignore vendored
View File

@ -43,7 +43,7 @@ epan/register_wslua.c
epan/taps.txt epan/taps.txt
epan/taps_wslua.c epan/taps_wslua.c
epan/uat_load.c epan/uat_load.c
epan/ws_version_info.c epan/version_info.c
epan/wslua/declare_wslua.h epan/wslua/declare_wslua.h
epan/wslua/register_wslua.c epan/wslua/register_wslua.c
epan/wslua/taps.txt epan/wslua/taps.txt
@ -59,7 +59,7 @@ tshark-tap-register.c
wiretap/ascend.c wiretap/ascend.c
wiretap/ascend.h wiretap/ascend.h
wiretap/k12text.c wiretap/k12text.c
wiretap/ws_version_info.c wiretap/version_info.c
wireshark-tap-register.c wireshark-tap-register.c
wireshark-tap-register-cache.pkl wireshark-tap-register-cache.pkl
ui/gtk/wireshark-gresources.c ui/gtk/wireshark-gresources.c

18
CMakeLists.txt
View File

@ -1602,7 +1602,7 @@ set(SHARK_COMMON_SRC
cfile.c cfile.c
frame_tvbuff.c frame_tvbuff.c
sync_pipe_write.c sync_pipe_write.c
ws_version_info.c version_info.c
) )
# sources for external capture interfaces # sources for external capture interfaces
@ -2592,7 +2592,7 @@ if(BUILD_randpkt)
) )
set(randpkt_FILES set(randpkt_FILES
randpkt.c randpkt.c
ws_version_info.c version_info.c
) )
add_executable(randpkt ${randpkt_FILES}) add_executable(randpkt ${randpkt_FILES})
add_dependencies(randpkt version) add_dependencies(randpkt version)
@ -2610,7 +2610,7 @@ if(BUILD_text2pcap)
) )
set(text2pcap_CLEAN_FILES set(text2pcap_CLEAN_FILES
text2pcap.c text2pcap.c
ws_version_info.c version_info.c
) )
set(text2pcap_FILES set(text2pcap_FILES
${text2pcap_CLEAN_FILES} ${text2pcap_CLEAN_FILES}
@ -2635,7 +2635,7 @@ if(BUILD_mergecap)
) )
set(mergecap_FILES set(mergecap_FILES
mergecap.c mergecap.c
ws_version_info.c version_info.c
${CMAKE_BINARY_DIR}/image/mergecap.rc ${CMAKE_BINARY_DIR}/image/mergecap.rc
) )
add_executable(mergecap ${mergecap_FILES}) add_executable(mergecap ${mergecap_FILES})
@ -2654,7 +2654,7 @@ if(BUILD_reordercap)
) )
set(reordercap_FILES set(reordercap_FILES
reordercap.c reordercap.c
ws_version_info.c version_info.c
${CMAKE_BINARY_DIR}/image/reordercap.rc ${CMAKE_BINARY_DIR}/image/reordercap.rc
) )
add_executable(reordercap ${reordercap_FILES}) add_executable(reordercap ${reordercap_FILES})
@ -2675,7 +2675,7 @@ if(BUILD_capinfos)
) )
set(capinfos_FILES set(capinfos_FILES
capinfos.c capinfos.c
ws_version_info.c version_info.c
${CMAKE_BINARY_DIR}/image/capinfos.rc ${CMAKE_BINARY_DIR}/image/capinfos.rc
) )
add_executable(capinfos ${capinfos_FILES}) add_executable(capinfos ${capinfos_FILES})
@ -2695,7 +2695,7 @@ if(BUILD_captype)
) )
set(captype_FILES set(captype_FILES
captype.c captype.c
ws_version_info.c version_info.c
${CMAKE_BINARY_DIR}/image/captype.rc ${CMAKE_BINARY_DIR}/image/captype.rc
) )
add_executable(captype ${captype_FILES}) add_executable(captype ${captype_FILES})
@ -2715,7 +2715,7 @@ if(BUILD_editcap)
) )
set(editcap_FILES set(editcap_FILES
editcap.c editcap.c
ws_version_info.c version_info.c
${CMAKE_BINARY_DIR}/image/editcap.rc ${CMAKE_BINARY_DIR}/image/editcap.rc
) )
add_executable(editcap ${editcap_FILES}) add_executable(editcap ${editcap_FILES})
@ -2747,7 +2747,7 @@ if(BUILD_dumpcap AND PCAP_FOUND)
dumpcap.c dumpcap.c
ringbuffer.c ringbuffer.c
sync_pipe_write.c sync_pipe_write.c
ws_version_info.c version_info.c
${CMAKE_BINARY_DIR}/image/dumpcap.rc ${CMAKE_BINARY_DIR}/image/dumpcap.rc
) )
add_executable(dumpcap ${dumpcap_FILES}) add_executable(dumpcap ${dumpcap_FILES})

28
Makefile.am
View File

@ -410,7 +410,7 @@ WIRESHARK_COMMON_SRC = \
file.c \ file.c \
fileset.c \ fileset.c \
summary.c \ summary.c \
ws_version_info.c version_info.c
if HAVE_EXTCAP if HAVE_EXTCAP
SHARK_COMMON_SRC += $(EXTCAP_COMMON_SRC) SHARK_COMMON_SRC += $(EXTCAP_COMMON_SRC)
@ -488,7 +488,7 @@ tshark_SOURCES = \
$(SHARK_COMMON_SRC) \ $(SHARK_COMMON_SRC) \
capture_opts.c \ capture_opts.c \
tshark.c \ tshark.c \
ws_version_info.c version_info.c
tshark_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) tshark_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
@ -513,7 +513,7 @@ tshark_LDADD = \
tfshark_SOURCES = \ tfshark_SOURCES = \
$(SHARK_COMMON_SRC) \ $(SHARK_COMMON_SRC) \
tfshark.c \ tfshark.c \
ws_version_info.c version_info.c
tfshark_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) tfshark_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
@ -536,7 +536,7 @@ tfshark_LDADD = \
rawshark_SOURCES = \ rawshark_SOURCES = \
$(SHARK_COMMON_SRC) \ $(SHARK_COMMON_SRC) \
rawshark.c \ rawshark.c \
ws_version_info.c version_info.c
rawshark_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) rawshark_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
@ -562,7 +562,7 @@ sharkd_SOURCES = \
sharkd.h \ sharkd.h \
sharkd_daemon.c \ sharkd_daemon.c \
sharkd_session.c \ sharkd_session.c \
ws_version_info.c version_info.c
sharkd_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) sharkd_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
@ -594,7 +594,7 @@ endif
text2pcap_SOURCES = \ text2pcap_SOURCES = \
text2pcap.c \ text2pcap.c \
text2pcap-scanner.l \ text2pcap-scanner.l \
ws_version_info.c version_info.c
text2pcap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) text2pcap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
@ -612,7 +612,7 @@ text2pcap_LDADD = \
mergecap_SOURCES = \ mergecap_SOURCES = \
mergecap.c \ mergecap.c \
ws_version_info.c version_info.c
mergecap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) mergecap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
@ -625,7 +625,7 @@ mergecap_LDADD = \
capinfos_SOURCES = \ capinfos_SOURCES = \
capinfos.c \ capinfos.c \
ws_version_info.c version_info.c
capinfos_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) capinfos_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
@ -639,7 +639,7 @@ capinfos_LDADD = \
captype_SOURCES = \ captype_SOURCES = \
captype.c \ captype.c \
ws_version_info.c version_info.c
captype_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) captype_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
@ -652,7 +652,7 @@ captype_LDADD = \
editcap_SOURCES = \ editcap_SOURCES = \
editcap.c \ editcap.c \
ws_version_info.c version_info.c
editcap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) editcap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
@ -666,7 +666,7 @@ editcap_LDADD = \
reordercap_SOURCES = \ reordercap_SOURCES = \
reordercap.c \ reordercap.c \
ws_version_info.c version_info.c
reordercap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) reordercap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
@ -679,7 +679,7 @@ reordercap_LDADD = \
randpkt_SOURCES = \ randpkt_SOURCES = \
randpkt.c \ randpkt.c \
ws_version_info.c version_info.c
randpkt_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) randpkt_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
@ -716,7 +716,7 @@ dumpcap_SOURCES = \
dumpcap.c \ dumpcap.c \
ringbuffer.c \ ringbuffer.c \
sync_pipe_write.c \ sync_pipe_write.c \
ws_version_info.c version_info.c
dumpcap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) dumpcap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
@ -761,7 +761,7 @@ noinst_HEADERS = \
extcap.h \ extcap.h \
extcap_parser.h \ extcap_parser.h \
extcap_spawn.h \ extcap_spawn.h \
ws_version_info.h version_info.h
# #
# Build the version string # Build the version string

2
capinfos.c
View File

@ -75,7 +75,7 @@
#include <wsutil/crash_info.h> #include <wsutil/crash_info.h>
#include <wsutil/filesystem.h> #include <wsutil/filesystem.h>
#include <wsutil/privileges.h> #include <wsutil/privileges.h>
#include <ws_version_info.h> #include <version_info.h>
#include <wiretap/wtap_opttypes.h> #include <wiretap/wtap_opttypes.h>
#ifdef HAVE_PLUGINS #ifdef HAVE_PLUGINS

2
captype.c
View File

@ -45,7 +45,7 @@
#include <wsutil/file_util.h> #include <wsutil/file_util.h>
#include <wsutil/filesystem.h> #include <wsutil/filesystem.h>
#include <wsutil/privileges.h> #include <wsutil/privileges.h>
#include <ws_version_info.h> #include <version_info.h>
#ifdef HAVE_PLUGINS #ifdef HAVE_PLUGINS
#include <wsutil/plugins.h> #include <wsutil/plugins.h>

2
dumpcap.c
View File

@ -57,7 +57,7 @@
#include <wsutil/cmdarg_err.h> #include <wsutil/cmdarg_err.h>
#include <wsutil/crash_info.h> #include <wsutil/crash_info.h>
#include <wsutil/strtoi.h> #include <wsutil/strtoi.h>
#include <ws_version_info.h> #include <version_info.h>
#ifndef HAVE_GETOPT_LONG #ifndef HAVE_GETOPT_LONG
#include "wsutil/wsgetopt.h" #include "wsutil/wsgetopt.h"

2
editcap.c
View File

@ -86,7 +86,7 @@
#include <wsutil/report_message.h> #include <wsutil/report_message.h>
#include <wsutil/strnatcmp.h> #include <wsutil/strnatcmp.h>
#include <wsutil/str_util.h> #include <wsutil/str_util.h>
#include <ws_version_info.h> #include <version_info.h>
#include <wsutil/pint.h> #include <wsutil/pint.h>
#include <wsutil/strtoi.h> #include <wsutil/strtoi.h>
#include <wiretap/wtap_opttypes.h> #include <wiretap/wtap_opttypes.h>

2
epan/CMakeLists.txt
View File

@ -280,7 +280,7 @@ set(LIBWIRESHARK_FILES
value_string.c value_string.c
unit_strings.c unit_strings.c
xdlc.c xdlc.c
${CMAKE_SOURCE_DIR}/ws_version_info.c ${CMAKE_SOURCE_DIR}/version_info.c
) )
set(LIBWIRESHARK_CLEAN_FILES set(LIBWIRESHARK_CLEAN_FILES

8
epan/Makefile.am
View File

@ -308,7 +308,7 @@ subpkginclude_HEADERS = $(LIBWIRESHARK_INCLUDES_PUBLIC)
libwireshark_la_SOURCES = \ libwireshark_la_SOURCES = \
$(LIBWIRESHARK_SRC) \ $(LIBWIRESHARK_SRC) \
$(LIBWIRESHARK_INCLUDES_PRIVATE) \ $(LIBWIRESHARK_INCLUDES_PRIVATE) \
ws_version_info.c version_info.c
libwireshark_la_CPPFLAGS = $(AM_CPPFLAGS) -DWS_BUILD_DLL libwireshark_la_CPPFLAGS = $(AM_CPPFLAGS) -DWS_BUILD_DLL
@ -402,7 +402,7 @@ DISTCLEANFILES = \
$(NODIST_LIBWIRESHARK_GENERATED_C_FILES) \ $(NODIST_LIBWIRESHARK_GENERATED_C_FILES) \
$(NODIST_LIBWIRESHARK_GENERATED_HEADER_FILES) \ $(NODIST_LIBWIRESHARK_GENERATED_HEADER_FILES) \
dtd_grammar.out \ dtd_grammar.out \
ws_version_info.c version_info.c
MAINTAINERCLEANFILES = \ MAINTAINERCLEANFILES = \
$(LIBWIRESHARK_GENERATED_C_FILES) \ $(LIBWIRESHARK_GENERATED_C_FILES) \
@ -412,7 +412,7 @@ MAINTAINERCLEANFILES = \
BUILT_SOURCES = \ BUILT_SOURCES = \
$(LIBWIRESHARK_GENERATED_HEADER_FILES) \ $(LIBWIRESHARK_GENERATED_HEADER_FILES) \
$(NODIST_LIBWIRESHARK_GENERATED_HEADER_FILES) \ $(NODIST_LIBWIRESHARK_GENERATED_HEADER_FILES) \
ws_version_info.c version_info.c
EXTRA_PROGRAMS = reassemble_test tvbtest oids_test exntest EXTRA_PROGRAMS = reassemble_test tvbtest oids_test exntest
@ -452,7 +452,7 @@ dtd_grammar.h: dtd_grammar.c
dtd_grammar.c : $(LEMON) $(lemon_srcdir)/lempar.c $(srcdir)/dtd_grammar.lemon dtd_grammar.c : $(LEMON) $(lemon_srcdir)/lempar.c $(srcdir)/dtd_grammar.lemon
$(AM_V_LEMON)$(LEMON) T=$(lemon_srcdir)/lempar.c $(srcdir)/dtd_grammar.lemon $(AM_V_LEMON)$(LEMON) T=$(lemon_srcdir)/lempar.c $(srcdir)/dtd_grammar.lemon
ws_version_info.c: $(top_srcdir)/ws_version_info.c version_info.c: $(top_srcdir)/version_info.c
$(AM_V_LN_S)$(LN_S) $< $(AM_V_LN_S)$(LN_S) $<
tvbtest.o exntest.o oids_test.o: exceptions.h tvbtest.o exntest.o oids_test.o: exceptions.h

2
epan/dissectors/packet-ssl-utils.c
View File

@ -51,7 +51,7 @@
#include <wsutil/strtoi.h> #include <wsutil/strtoi.h>
#include <wsutil/wsgcrypt.h> #include <wsutil/wsgcrypt.h>
#include <wsutil/rsa.h> #include <wsutil/rsa.h>
#include <ws_version_info.h> #include <version_info.h>
#include "packet-ber.h" #include "packet-ber.h"
#include "packet-x509af.h" #include "packet-x509af.h"
#include "packet-x509if.h" #include "packet-x509if.h"

2
epan/epan.c
View File

@ -32,7 +32,7 @@
#include <glib.h> #include <glib.h>
#include <ws_version_info.h> #include <version_info.h>
#include <wsutil/report_message.h> #include <wsutil/report_message.h>
#include <epan/exceptions.h> #include <epan/exceptions.h>

2
epan/print.c
View File

@ -38,7 +38,7 @@
#include <epan/print.h> #include <epan/print.h>
#include <epan/charsets.h> #include <epan/charsets.h>
#include <wsutil/filesystem.h> #include <wsutil/filesystem.h>
#include <ws_version_info.h> #include <version_info.h>
#include <wsutil/utf8_entities.h> #include <wsutil/utf8_entities.h>
#include <ftypes/ftypes-int.h> #include <ftypes/ftypes-int.h>
#include <wsutil/glib-compat.h> #include <wsutil/glib-compat.h>

2
file.c
View File

@ -33,7 +33,7 @@
#include <wsutil/tempfile.h> #include <wsutil/tempfile.h>
#include <wsutil/file_util.h> #include <wsutil/file_util.h>
#include <wsutil/filesystem.h> #include <wsutil/filesystem.h>
#include <ws_version_info.h> #include <version_info.h>
#include <wiretap/merge.h> #include <wiretap/merge.h>

2
mergecap.c
View File

@ -49,7 +49,7 @@
#include <wsutil/file_util.h> #include <wsutil/file_util.h>
#include <wsutil/privileges.h> #include <wsutil/privileges.h>
#include <wsutil/strnatcmp.h> #include <wsutil/strnatcmp.h>
#include <ws_version_info.h> #include <version_info.h>
#ifdef HAVE_PLUGINS #ifdef HAVE_PLUGINS
#include <wsutil/plugins.h> #include <wsutil/plugins.h>

2
rawshark.c
View File

@ -99,7 +99,7 @@
#include <wiretap/pcap-encap.h> #include <wiretap/pcap-encap.h>
#include <wsutil/clopts_common.h> #include <wsutil/clopts_common.h>
#include <ws_version_info.h> #include <version_info.h>
#include "caputils/capture-pcap-util.h" #include "caputils/capture-pcap-util.h"

2
reordercap.c
View File

@ -43,7 +43,7 @@
#include <wsutil/filesystem.h> #include <wsutil/filesystem.h>
#include <wsutil/file_util.h> #include <wsutil/file_util.h>
#include <wsutil/privileges.h> #include <wsutil/privileges.h>
#include <ws_version_info.h> #include <version_info.h>
#include <wiretap/wtap_opttypes.h> #include <wiretap/wtap_opttypes.h>
#ifdef HAVE_PLUGINS #ifdef HAVE_PLUGINS

2
sharkd.c
View File

@ -43,7 +43,7 @@
#include <wsutil/file_util.h> #include <wsutil/file_util.h>
#include <wsutil/privileges.h> #include <wsutil/privileges.h>
#include <wsutil/report_message.h> #include <wsutil/report_message.h>
#include <ws_version_info.h> #include <version_info.h>
#include <wiretap/wtap_opttypes.h> #include <wiretap/wtap_opttypes.h>
#include <wiretap/pcapng.h> #include <wiretap/pcapng.h>

2
text2pcap.c
View File

@ -112,7 +112,7 @@
#include <string.h> #include <string.h>
#include <wsutil/file_util.h> #include <wsutil/file_util.h>
#include <wsutil/crash_info.h> #include <wsutil/crash_info.h>
#include <ws_version_info.h> #include <version_info.h>
#include <wsutil/inet_addr.h> #include <wsutil/inet_addr.h>
#ifdef _WIN32 #ifdef _WIN32

2
tfshark.c
View File

@ -52,7 +52,7 @@
#include <wsutil/file_util.h> #include <wsutil/file_util.h>
#include <wsutil/privileges.h> #include <wsutil/privileges.h>
#include <wsutil/report_message.h> #include <wsutil/report_message.h>
#include <ws_version_info.h> #include <version_info.h>
#include "globals.h" #include "globals.h"
#include <epan/timestamp.h> #include <epan/timestamp.h>

2
tools/oss-fuzzshark/fuzzshark.c
View File

@ -38,7 +38,7 @@
#include <wsutil/filesystem.h> #include <wsutil/filesystem.h>
#include <wsutil/privileges.h> #include <wsutil/privileges.h>
#include <wsutil/report_message.h> #include <wsutil/report_message.h>
#include <ws_version_info.h> #include <version_info.h>
#include <wiretap/wtap.h> #include <wiretap/wtap.h>

2
tshark.c
View File

@ -65,7 +65,7 @@
#include <wsutil/file_util.h> #include <wsutil/file_util.h>
#include <wsutil/privileges.h> #include <wsutil/privileges.h>
#include <wsutil/report_message.h> #include <wsutil/report_message.h>
#include <ws_version_info.h> #include <version_info.h>
#include <wiretap/wtap_opttypes.h> #include <wiretap/wtap_opttypes.h>
#include <wiretap/pcapng.h> #include <wiretap/pcapng.h>

2
ui/commandline.c
View File

@ -36,7 +36,7 @@
#include "wsutil/wsgetopt.h" #include "wsutil/wsgetopt.h"
#endif #endif
#include <ws_version_info.h> #include <version_info.h>
#include <wsutil/clopts_common.h> #include <wsutil/clopts_common.h>
#include <wsutil/cmdarg_err.h> #include <wsutil/cmdarg_err.h>

2
ui/decode_as_utils.c
View File

@ -36,7 +36,7 @@
#include "wsutil/file_util.h" #include "wsutil/file_util.h"
#include "wsutil/filesystem.h" #include "wsutil/filesystem.h"
#include "wsutil/cmdarg_err.h" #include "wsutil/cmdarg_err.h"
#include "ws_version_info.h" #include "version_info.h"
/* XXX - We might want to switch this to a UAT */ /* XXX - We might want to switch this to a UAT */

2
ui/export_pdu_ui_utils.c
View File

@ -28,7 +28,7 @@
#include "wiretap/pcap-encap.h" #include "wiretap/pcap-encap.h"
#include "wsutil/os_version_info.h" #include "wsutil/os_version_info.h"
#include "wsutil/tempfile.h" #include "wsutil/tempfile.h"
#include "ws_version_info.h" #include "version_info.h"
#include <epan/tap.h> #include <epan/tap.h>
#include <epan/exported_pdu.h> #include <epan/exported_pdu.h>

2
ui/gtk/about_dlg.c
View File

@ -29,7 +29,7 @@
#include <wsutil/filesystem.h> #include <wsutil/filesystem.h>
#include <wsutil/copyright_info.h> #include <wsutil/copyright_info.h>
#include <ws_version_info.h> #include <version_info.h>
#ifdef HAVE_LIBSMI #ifdef HAVE_LIBSMI
#include <epan/oids.h> #include <epan/oids.h>
#endif #endif

2
ui/gtk/file_import_dlg.c
View File

@ -47,7 +47,7 @@
#include "wsutil/file_util.h" #include "wsutil/file_util.h"
#include "wsutil/tempfile.h" #include "wsutil/tempfile.h"
#include "wsutil/os_version_info.h" #include "wsutil/os_version_info.h"
#include "ws_version_info.h" #include "version_info.h"
#include "wiretap/wtap_opttypes.h" #include "wiretap/wtap_opttypes.h"
#include "wiretap/pcapng.h" #include "wiretap/pcapng.h"

2
ui/gtk/follow_stream.c
View File

@ -42,7 +42,7 @@
#include <ui/simple_dialog.h> #include <ui/simple_dialog.h>
#include <wsutil/file_util.h> #include <wsutil/file_util.h>
#include <ws_version_info.h> #include <version_info.h>
#include "gtkglobals.h" #include "gtkglobals.h"
#include "ui/gtk/keys.h" #include "ui/gtk/keys.h"

2
ui/gtk/main.c
View File

@ -54,7 +54,7 @@
#include <wsutil/file_util.h> #include <wsutil/file_util.h>
#include <wsutil/privileges.h> #include <wsutil/privileges.h>
#include <wsutil/report_message.h> #include <wsutil/report_message.h>
#include <ws_version_info.h> #include <version_info.h>
#include <wiretap/merge.h> #include <wiretap/merge.h>

2
ui/gtk/main_titlebar.c
View File

@ -32,7 +32,7 @@
#include "gui_utils.h" #include "gui_utils.h"
#include "main_titlebar.h" #include "main_titlebar.h"
#include <ws_version_info.h> #include <version_info.h>
/* /*
* Key to attach the "un-decorated" title to the window, so that if the * Key to attach the "un-decorated" title to the window, so that if the

2
ui/gtk/main_welcome.c
View File

@ -33,7 +33,7 @@
#include <wsutil/file_util.h> #include <wsutil/file_util.h>
#include <wsutil/str_util.h> #include <wsutil/str_util.h>
#include <ws_version_info.h> #include <version_info.h>
#ifdef HAVE_LIBPCAP #ifdef HAVE_LIBPCAP
#include "ui/capture_ui_utils.h" #include "ui/capture_ui_utils.h"

2
ui/gtk/summary_dlg.c
View File

@ -28,7 +28,7 @@
#include <ws_version_info.h> #include <version_info.h>
#include "../../file.h" #include "../../file.h"
#include "../../summary.h" #include "../../summary.h"

2
ui/qt/about_dialog.cpp
View File

@ -51,7 +51,7 @@
#include "wsutil/tempfile.h" #include "wsutil/tempfile.h"
#include "wsutil/plugins.h" #include "wsutil/plugins.h"
#include "wsutil/copyright_info.h" #include "wsutil/copyright_info.h"
#include "ws_version_info.h" #include "version_info.h"
#ifdef HAVE_EXTCAP #ifdef HAVE_EXTCAP
#include "extcap.h" #include "extcap.h"

2
ui/qt/capture_file_properties_dialog.cpp
View File

@ -28,7 +28,7 @@
#include "wsutil/str_util.h" #include "wsutil/str_util.h"
#include "wsutil/utf8_entities.h" #include "wsutil/utf8_entities.h"
#include "ws_version_info.h" #include "version_info.h"
#include <ui/qt/utils/qt_ui_utils.h> #include <ui/qt/utils/qt_ui_utils.h>
#include "wireshark_application.h" #include "wireshark_application.h"

2
ui/qt/follow_stream_dialog.cpp
View File

@ -40,7 +40,7 @@
#include "wsutil/file_util.h" #include "wsutil/file_util.h"
#include "wsutil/str_util.h" #include "wsutil/str_util.h"
#include "ws_version_info.h" #include "version_info.h"
#include "ws_symbol_export.h" #include "ws_symbol_export.h"

2
ui/qt/main_welcome.cpp
View File

@ -28,7 +28,7 @@
#include "ui/capture_globals.h" #include "ui/capture_globals.h"
#include "ui/help_url.h" #include "ui/help_url.h"
#include "ws_version_info.h" #include "version_info.h"
#include "main_welcome.h" #include "main_welcome.h"
#include <ui_main_welcome.h> #include <ui_main_welcome.h>

2
ui/qt/main_window.cpp
View File

@ -33,7 +33,7 @@ DIAG_ON(frame-larger-than=)
#include "epan/dissector_filters.h" #include "epan/dissector_filters.h"
#include <epan/epan_dissect.h> #include <epan/epan_dissect.h>
#include <wsutil/filesystem.h> #include <wsutil/filesystem.h>
#include <ws_version_info.h> #include <version_info.h>
#include <epan/prefs.h> #include <epan/prefs.h>
#include <epan/stats_tree_priv.h> #include <epan/stats_tree_priv.h>
#include <epan/plugin_if.h> #include <epan/plugin_if.h>

2
ui/tap_export_pdu.c
View File

@ -26,7 +26,7 @@
#include "globals.h" #include "globals.h"
#include "wiretap/pcap-encap.h" #include "wiretap/pcap-encap.h"
#include "wsutil/os_version_info.h" #include "wsutil/os_version_info.h"
#include "ws_version_info.h" #include "version_info.h"
#include <epan/tap.h> #include <epan/tap.h>
#include <epan/exported_pdu.h> #include <epan/exported_pdu.h>

4
ws_version_info.c → version_info.c
View File

@ -1,4 +1,4 @@
/* ws_version_info.c /* version_info.c
* Routines to report version information for Wireshark programs * Routines to report version information for Wireshark programs
* *
* Wireshark - Network traffic analyzer * Wireshark - Network traffic analyzer
@ -44,7 +44,7 @@
#include "version.h" #include "version.h"
#include "ws_version_info.h" #include "version_info.h"
#include <wsutil/cpu_info.h> #include <wsutil/cpu_info.h>
#include <wsutil/copyright_info.h> #include <wsutil/copyright_info.h>

2
ws_version_info.h → version_info.h
View File

@ -1,4 +1,4 @@
/* ws_version_info.h /* version_info.h
* Declarations of routines to report version information for Wireshark * Declarations of routines to report version information for Wireshark
* programs * programs
* *

2
wireshark-qt.cpp
View File

@ -51,7 +51,7 @@
#endif #endif
#include <wsutil/report_message.h> #include <wsutil/report_message.h>
#include <wsutil/unicode-utils.h> #include <wsutil/unicode-utils.h>
#include <ws_version_info.h> #include <version_info.h>
#include <epan/addr_resolv.h> #include <epan/addr_resolv.h>
#include <epan/ex-opt.h> #include <epan/ex-opt.h>

2
wiretap/CMakeLists.txt
View File

@ -90,7 +90,7 @@ set(WIRETAP_FILES
vwr.c vwr.c
wtap.c wtap.c
wtap_opttypes.c wtap_opttypes.c
${CMAKE_SOURCE_DIR}/ws_version_info.c ${CMAKE_SOURCE_DIR}/version_info.c
) )
set_source_files_properties( set_source_files_properties(

8
wiretap/Makefile.am
View File

@ -189,7 +189,7 @@ GENERATED_FILES = $(GENERATED_C_FILES) $(GENERATED_HEADER_FILES)
libwiretap_la_SOURCES = \ libwiretap_la_SOURCES = \
$(NONGENERATED_C_FILES) \ $(NONGENERATED_C_FILES) \
$(NONGENERATED_HEADER_FILES) \ $(NONGENERATED_HEADER_FILES) \
ws_version_info.c version_info.c
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
libwiretap_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@ libwiretap_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@
@ -215,13 +215,13 @@ CLEANFILES = \
*~ *~
DISTCLEANFILES = \ DISTCLEANFILES = \
ws_version_info.c version_info.c
MAINTAINERCLEANFILES = \ MAINTAINERCLEANFILES = \
$(GENERATED_FILES) \ $(GENERATED_FILES) \
Makefile.in Makefile.in
BUILT_SOURCES = $(GENERATED_HEADER_FILES) ws_version_info.c BUILT_SOURCES = $(GENERATED_HEADER_FILES) version_info.c
EXTRA_DIST = \ EXTRA_DIST = \
.editorconfig \ .editorconfig \
@ -244,7 +244,7 @@ ascend.c: $(srcdir)/ascend.y ascend_scanner_lex.h
fi fi
$(AM_V_YACC)$(YACC) -d -p ascend -o ascend.c $(srcdir)/ascend.y $(AM_V_YACC)$(YACC) -d -p ascend -o ascend.c $(srcdir)/ascend.y
ws_version_info.c: $(top_srcdir)/ws_version_info.c version_info.c: $(top_srcdir)/version_info.c
$(AM_V_LN_S)$(LN_S) $< $(AM_V_LN_S)$(LN_S) $<
# ABI compliance checker can be obtained from # ABI compliance checker can be obtained from

2
wiretap/nettrace_3gpp_32_423.c
View File

@ -42,7 +42,7 @@
#include <wsutil/buffer.h> #include <wsutil/buffer.h>
#include "wsutil/tempfile.h" #include "wsutil/tempfile.h"
#include "wsutil/os_version_info.h" #include "wsutil/os_version_info.h"
#include "ws_version_info.h" #include "version_info.h"
#include "wsutil/str_util.h" #include "wsutil/str_util.h"