Rename "ws_version_info.h", also .c
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>
Tue, 26 Sep 2017 14:04:56 +0000 (15:04 +0100)
committerJoão Valverde <j@v6e.pt>
Tue, 26 Sep 2017 17:32:08 +0000 (17:32 +0000)
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>
44 files changed:
.editorconfig
.gitignore
CMakeLists.txt
Makefile.am
capinfos.c
captype.c
dumpcap.c
editcap.c
epan/CMakeLists.txt
epan/Makefile.am
epan/dissectors/packet-ssl-utils.c
epan/epan.c
epan/print.c
file.c
mergecap.c
rawshark.c
reordercap.c
sharkd.c
text2pcap.c
tfshark.c
tools/oss-fuzzshark/fuzzshark.c
tshark.c
ui/commandline.c
ui/decode_as_utils.c
ui/export_pdu_ui_utils.c
ui/gtk/about_dlg.c
ui/gtk/file_import_dlg.c
ui/gtk/follow_stream.c
ui/gtk/main.c
ui/gtk/main_titlebar.c
ui/gtk/main_welcome.c
ui/gtk/summary_dlg.c
ui/qt/about_dialog.cpp
ui/qt/capture_file_properties_dialog.cpp
ui/qt/follow_stream_dialog.cpp
ui/qt/main_welcome.cpp
ui/qt/main_window.cpp
ui/tap_export_pdu.c
version_info.c [moved from ws_version_info.c with 99% similarity]
version_info.h [moved from ws_version_info.h with 99% similarity]
wireshark-qt.cpp
wiretap/CMakeLists.txt
wiretap/Makefile.am
wiretap/nettrace_3gpp_32_423.c

index 4e61cdbb6b6575600531622dfa70db1067d5ff67..6d83a185fba1fc378617ea8b8cf3d15934467041 100644 (file)
@@ -80,6 +80,6 @@ indent_size = tab
 indent_style = tab
 indent_size = tab
 
-[ws_version_info.[ch]]
+[version_info.[ch]]
 indent_style = tab
 indent_size = tab
index 672b76fb46f840e61390d330d3b69c06d82c179a..7e9b1b75f8d5803829895bb3bb74ca9e2d83a57a 100644 (file)
@@ -43,7 +43,7 @@ epan/register_wslua.c
 epan/taps.txt
 epan/taps_wslua.c
 epan/uat_load.c
-epan/ws_version_info.c
+epan/version_info.c
 epan/wslua/declare_wslua.h
 epan/wslua/register_wslua.c
 epan/wslua/taps.txt
@@ -59,7 +59,7 @@ tshark-tap-register.c
 wiretap/ascend.c
 wiretap/ascend.h
 wiretap/k12text.c
-wiretap/ws_version_info.c
+wiretap/version_info.c
 wireshark-tap-register.c
 wireshark-tap-register-cache.pkl
 ui/gtk/wireshark-gresources.c
index afbff015ac724d7a338390a23681ba8a6354b773..10983f48874f33823ec4b6f5aec04beb7bb44061 100644 (file)
@@ -1602,7 +1602,7 @@ set(SHARK_COMMON_SRC
        cfile.c
        frame_tvbuff.c
        sync_pipe_write.c
-       ws_version_info.c
+       version_info.c
 )
 
 # sources for external capture interfaces
@@ -2592,7 +2592,7 @@ if(BUILD_randpkt)
        )
        set(randpkt_FILES
                randpkt.c
-               ws_version_info.c
+               version_info.c
        )
        add_executable(randpkt ${randpkt_FILES})
        add_dependencies(randpkt version)
@@ -2610,7 +2610,7 @@ if(BUILD_text2pcap)
        )
        set(text2pcap_CLEAN_FILES
                text2pcap.c
-               ws_version_info.c
+               version_info.c
        )
        set(text2pcap_FILES
                ${text2pcap_CLEAN_FILES}
@@ -2635,7 +2635,7 @@ if(BUILD_mergecap)
        )
        set(mergecap_FILES
                mergecap.c
-               ws_version_info.c
+               version_info.c
                ${CMAKE_BINARY_DIR}/image/mergecap.rc
        )
        add_executable(mergecap ${mergecap_FILES})
@@ -2654,7 +2654,7 @@ if(BUILD_reordercap)
        )
        set(reordercap_FILES
                reordercap.c
-               ws_version_info.c
+               version_info.c
                ${CMAKE_BINARY_DIR}/image/reordercap.rc
        )
        add_executable(reordercap ${reordercap_FILES})
@@ -2675,7 +2675,7 @@ if(BUILD_capinfos)
        )
        set(capinfos_FILES
                capinfos.c
-               ws_version_info.c
+               version_info.c
                ${CMAKE_BINARY_DIR}/image/capinfos.rc
        )
        add_executable(capinfos ${capinfos_FILES})
@@ -2695,7 +2695,7 @@ if(BUILD_captype)
        )
        set(captype_FILES
                captype.c
-               ws_version_info.c
+               version_info.c
                ${CMAKE_BINARY_DIR}/image/captype.rc
        )
        add_executable(captype ${captype_FILES})
@@ -2715,7 +2715,7 @@ if(BUILD_editcap)
        )
        set(editcap_FILES
                editcap.c
-               ws_version_info.c
+               version_info.c
                ${CMAKE_BINARY_DIR}/image/editcap.rc
        )
        add_executable(editcap ${editcap_FILES})
@@ -2747,7 +2747,7 @@ if(BUILD_dumpcap AND PCAP_FOUND)
                dumpcap.c
                ringbuffer.c
                sync_pipe_write.c
-               ws_version_info.c
+               version_info.c
                ${CMAKE_BINARY_DIR}/image/dumpcap.rc
        )
        add_executable(dumpcap ${dumpcap_FILES})
index b7db8736efdcfb50a96ddf7e16da44cc92723fa8..afec9af0594dc1135f9c99c5ce7ed5d19d7bf2e7 100644 (file)
@@ -410,7 +410,7 @@ WIRESHARK_COMMON_SRC = \
        file.c                  \
        fileset.c               \
        summary.c               \
-       ws_version_info.c
+       version_info.c
 
 if HAVE_EXTCAP
 SHARK_COMMON_SRC += $(EXTCAP_COMMON_SRC)
@@ -488,7 +488,7 @@ tshark_SOURCES = \
        $(SHARK_COMMON_SRC)     \
        capture_opts.c          \
        tshark.c                \
-       ws_version_info.c
+       version_info.c
 
 tshark_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
@@ -513,7 +513,7 @@ tshark_LDADD = \
 tfshark_SOURCES = \
        $(SHARK_COMMON_SRC)     \
        tfshark.c               \
-       ws_version_info.c
+       version_info.c
 
 tfshark_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
@@ -536,7 +536,7 @@ tfshark_LDADD = \
 rawshark_SOURCES = \
        $(SHARK_COMMON_SRC)     \
        rawshark.c              \
-       ws_version_info.c
+       version_info.c
 
 rawshark_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
@@ -562,7 +562,7 @@ sharkd_SOURCES = \
        sharkd.h                \
        sharkd_daemon.c         \
        sharkd_session.c        \
-       ws_version_info.c
+       version_info.c
 
 sharkd_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
@@ -594,7 +594,7 @@ endif
 text2pcap_SOURCES = \
        text2pcap.c             \
        text2pcap-scanner.l     \
-       ws_version_info.c
+       version_info.c
 
 text2pcap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
@@ -612,7 +612,7 @@ text2pcap_LDADD = \
 
 mergecap_SOURCES = \
        mergecap.c      \
-       ws_version_info.c
+       version_info.c
 
 mergecap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
@@ -625,7 +625,7 @@ mergecap_LDADD = \
 
 capinfos_SOURCES = \
        capinfos.c      \
-       ws_version_info.c
+       version_info.c
 
 capinfos_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
@@ -639,7 +639,7 @@ capinfos_LDADD = \
 
 captype_SOURCES = \
        captype.c       \
-       ws_version_info.c
+       version_info.c
 
 captype_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
@@ -652,7 +652,7 @@ captype_LDADD = \
 
 editcap_SOURCES = \
        editcap.c       \
-       ws_version_info.c
+       version_info.c
 
 editcap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
@@ -666,7 +666,7 @@ editcap_LDADD = \
 
 reordercap_SOURCES = \
        reordercap.c    \
-       ws_version_info.c
+       version_info.c
 
 reordercap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
@@ -679,7 +679,7 @@ reordercap_LDADD = \
 
 randpkt_SOURCES = \
        randpkt.c       \
-       ws_version_info.c
+       version_info.c
 
 randpkt_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
@@ -716,7 +716,7 @@ dumpcap_SOURCES = \
        dumpcap.c                       \
        ringbuffer.c                    \
        sync_pipe_write.c               \
-       ws_version_info.c
+       version_info.c
 
 dumpcap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
@@ -761,7 +761,7 @@ noinst_HEADERS = \
        extcap.h                \
        extcap_parser.h         \
        extcap_spawn.h          \
-       ws_version_info.h
+       version_info.h
 
 #
 # Build the version string
index 428093c2c9fae067a48f930662e847a60f847f0d..dfea58e27a2713b22241190ab48ec2c941a68ff6 100644 (file)
@@ -75,7 +75,7 @@
 #include <wsutil/crash_info.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/privileges.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 #include <wiretap/wtap_opttypes.h>
 
 #ifdef HAVE_PLUGINS
index 29cdad938fc42ed9e5cb73fe970f3e755c75beed..289765c4e83800e302656071cc9279dd81ffd1ec 100644 (file)
--- a/captype.c
+++ b/captype.c
@@ -45,7 +45,7 @@
 #include <wsutil/file_util.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/privileges.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 
 #ifdef HAVE_PLUGINS
 #include <wsutil/plugins.h>
index 76fba65bcd1ce7b1b8c48881788f90309091eb0d..3ee8bef878cafde1e4253a9c7dc2e08edc9c51f0 100644 (file)
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -57,7 +57,7 @@
 #include <wsutil/cmdarg_err.h>
 #include <wsutil/crash_info.h>
 #include <wsutil/strtoi.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 
 #ifndef HAVE_GETOPT_LONG
 #include "wsutil/wsgetopt.h"
index 22b44bd9c3035bf2901997913028951a49860092..a9af646846d8a37ac29f6203443d2d367f7d9046 100644 (file)
--- a/editcap.c
+++ b/editcap.c
@@ -86,7 +86,7 @@
 #include <wsutil/report_message.h>
 #include <wsutil/strnatcmp.h>
 #include <wsutil/str_util.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 #include <wsutil/pint.h>
 #include <wsutil/strtoi.h>
 #include <wiretap/wtap_opttypes.h>
index 3f6d04266e9300e7c0d466544d09531c8e800f3d..adadd689e5a1bcec8c165fadbb0ee2a5057073d4 100644 (file)
@@ -280,7 +280,7 @@ set(LIBWIRESHARK_FILES
        value_string.c
        unit_strings.c
        xdlc.c
-       ${CMAKE_SOURCE_DIR}/ws_version_info.c
+       ${CMAKE_SOURCE_DIR}/version_info.c
 )
 
 set(LIBWIRESHARK_CLEAN_FILES
index 58c41447f05602328d42952dbe2ddd802a1377e3..ac9630cffc7a003e79746d71f659992499ad0501 100644 (file)
@@ -308,7 +308,7 @@ subpkginclude_HEADERS = $(LIBWIRESHARK_INCLUDES_PUBLIC)
 libwireshark_la_SOURCES = \
        $(LIBWIRESHARK_SRC)             \
        $(LIBWIRESHARK_INCLUDES_PRIVATE)        \
-       ws_version_info.c
+       version_info.c
 
 libwireshark_la_CPPFLAGS = $(AM_CPPFLAGS) -DWS_BUILD_DLL
 
@@ -402,7 +402,7 @@ DISTCLEANFILES = \
        $(NODIST_LIBWIRESHARK_GENERATED_C_FILES) \
        $(NODIST_LIBWIRESHARK_GENERATED_HEADER_FILES) \
        dtd_grammar.out \
-       ws_version_info.c
+       version_info.c
 
 MAINTAINERCLEANFILES = \
        $(LIBWIRESHARK_GENERATED_C_FILES) \
@@ -412,7 +412,7 @@ MAINTAINERCLEANFILES = \
 BUILT_SOURCES = \
        $(LIBWIRESHARK_GENERATED_HEADER_FILES) \
        $(NODIST_LIBWIRESHARK_GENERATED_HEADER_FILES) \
-       ws_version_info.c
+       version_info.c
 
 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
        $(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) $<
 
 tvbtest.o exntest.o oids_test.o: exceptions.h
index 1797e37e148e613c4c69a442f9de9aff14c04d8b..378d35a9c3a534476d46c014d119f31fe7331a6b 100644 (file)
@@ -51,7 +51,7 @@
 #include <wsutil/strtoi.h>
 #include <wsutil/wsgcrypt.h>
 #include <wsutil/rsa.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 #include "packet-ber.h"
 #include "packet-x509af.h"
 #include "packet-x509if.h"
index 74ddfe5001660489c34a4b4bc51fd35b8f2090fe..03a9724e71b3c38a71514333b9b0da6470d392c6 100644 (file)
@@ -32,7 +32,7 @@
 
 #include <glib.h>
 
-#include <ws_version_info.h>
+#include <version_info.h>
 #include <wsutil/report_message.h>
 
 #include <epan/exceptions.h>
index 435605c3890ad1716c0f8fe850a1901000b7e42b..7534c5c9bca29c7818f7b8d1e2a15104ca4274b4 100644 (file)
@@ -38,7 +38,7 @@
 #include <epan/print.h>
 #include <epan/charsets.h>
 #include <wsutil/filesystem.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 #include <wsutil/utf8_entities.h>
 #include <ftypes/ftypes-int.h>
 #include <wsutil/glib-compat.h>
diff --git a/file.c b/file.c
index 9d178770cdd5c1330f56f9905f98b26507861243..97a05630f64b19b61364580c238d5d9f6273ca41 100644 (file)
--- a/file.c
+++ b/file.c
@@ -33,7 +33,7 @@
 #include <wsutil/tempfile.h>
 #include <wsutil/file_util.h>
 #include <wsutil/filesystem.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 
 #include <wiretap/merge.h>
 
index e696c0042fc9926293b087130d168bb7aee88d8e..97fcd135ecb0051c0f9c8b8f884fb569ba90dd78 100644 (file)
@@ -49,7 +49,7 @@
 #include <wsutil/file_util.h>
 #include <wsutil/privileges.h>
 #include <wsutil/strnatcmp.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 
 #ifdef HAVE_PLUGINS
 #include <wsutil/plugins.h>
index 6a9dacc722d5cbd9e2431d6173d35ed326e86b37..b59b3a33165fc829c7bd77becc05d0c316753a84 100644 (file)
@@ -99,7 +99,7 @@
 #include <wiretap/pcap-encap.h>
 
 #include <wsutil/clopts_common.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 
 #include "caputils/capture-pcap-util.h"
 
index 352c0c5a08e1edec951344220a78a95cf1d2d733..0129fc4865e804191a6f698e9b4dec96cc27327f 100644 (file)
@@ -43,7 +43,7 @@
 #include <wsutil/filesystem.h>
 #include <wsutil/file_util.h>
 #include <wsutil/privileges.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 #include <wiretap/wtap_opttypes.h>
 
 #ifdef HAVE_PLUGINS
index 8ca9ff328f2cf7e3973932f68ef9b5b1393dca73..c575224531b8277d5ffdc8777cfb67b7813982ee 100644 (file)
--- a/sharkd.c
+++ b/sharkd.c
@@ -43,7 +43,7 @@
 #include <wsutil/file_util.h>
 #include <wsutil/privileges.h>
 #include <wsutil/report_message.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 #include <wiretap/wtap_opttypes.h>
 #include <wiretap/pcapng.h>
 
index 8a946589ca1d5874f147d4d0f006181b23b99553..e55fc046a3914c2e02201430ab7266bd42e77632 100644 (file)
 #include <string.h>
 #include <wsutil/file_util.h>
 #include <wsutil/crash_info.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 #include <wsutil/inet_addr.h>
 
 #ifdef _WIN32
index 8eb591654c732f8ea9ff693d531e26156dafc567..db4c8d5d7207edc33cc179732bc3714bf54f51ab 100644 (file)
--- a/tfshark.c
+++ b/tfshark.c
@@ -52,7 +52,7 @@
 #include <wsutil/file_util.h>
 #include <wsutil/privileges.h>
 #include <wsutil/report_message.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 
 #include "globals.h"
 #include <epan/timestamp.h>
index ac2c809e7253ec94bdf9066d84a3cd4806498c6b..a88006ce69d4ab3327bea5e5015eaac2ca6b559f 100644 (file)
@@ -38,7 +38,7 @@
 #include <wsutil/filesystem.h>
 #include <wsutil/privileges.h>
 #include <wsutil/report_message.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 
 #include <wiretap/wtap.h>
 
index 06f574ee4df13081a5a2a7bb1f6b3d9484621399..ca0e3cd0030ca4a32c2bfe36d5c5e3e5f5cf0325 100644 (file)
--- a/tshark.c
+++ b/tshark.c
@@ -65,7 +65,7 @@
 #include <wsutil/file_util.h>
 #include <wsutil/privileges.h>
 #include <wsutil/report_message.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 #include <wiretap/wtap_opttypes.h>
 #include <wiretap/pcapng.h>
 
index b3e5f5c211dc975e2625d6b899a79fcf2ff0ea8f..2d77761c47885d65931e120ddc3f1a975712564a 100644 (file)
@@ -36,7 +36,7 @@
 #include "wsutil/wsgetopt.h"
 #endif
 
-#include <ws_version_info.h>
+#include <version_info.h>
 
 #include <wsutil/clopts_common.h>
 #include <wsutil/cmdarg_err.h>
index 0cf5942d57f40dfe41ec938827b5ccb87a2d39a9..321cfc5209107bf76e9803c8a9459f4fb0dc4e6e 100644 (file)
@@ -36,7 +36,7 @@
 #include "wsutil/file_util.h"
 #include "wsutil/filesystem.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 */
 
index be8b8915eefee6d09e948680c1927c847878c281..8a56fee2e7d3848ff41ccfd09a253c76f9062de8 100644 (file)
@@ -28,7 +28,7 @@
 #include "wiretap/pcap-encap.h"
 #include "wsutil/os_version_info.h"
 #include "wsutil/tempfile.h"
-#include "ws_version_info.h"
+#include "version_info.h"
 
 #include <epan/tap.h>
 #include <epan/exported_pdu.h>
index 1db3bba6e83760a9f9dfc2c1c9d5ace57b43c389..a2980bf6bb3b2275001360c0fac51c1e69fc9c6b 100644 (file)
@@ -29,7 +29,7 @@
 
 #include <wsutil/filesystem.h>
 #include <wsutil/copyright_info.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 #ifdef HAVE_LIBSMI
 #include <epan/oids.h>
 #endif
index b5745a6d7e0691417f7c0d335a8cf7a72d482054..8d9f58db958669e53bf8caed634f9015f866e920 100644 (file)
@@ -47,7 +47,7 @@
 #include "wsutil/file_util.h"
 #include "wsutil/tempfile.h"
 #include "wsutil/os_version_info.h"
-#include "ws_version_info.h"
+#include "version_info.h"
 #include "wiretap/wtap_opttypes.h"
 #include "wiretap/pcapng.h"
 
index f85dac21e09243993919c5ad4f2a4cf18b74599b..fe8578347c0bd6535f6f0409feb10176bb7534e3 100644 (file)
@@ -42,7 +42,7 @@
 #include <ui/simple_dialog.h>
 
 #include <wsutil/file_util.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 
 #include "gtkglobals.h"
 #include "ui/gtk/keys.h"
index 11c90e6dfe70c11f343b8d7b2b0854fd9c173e62..d840e8475c6bc7d0bc11854b911f339f60681455 100644 (file)
@@ -54,7 +54,7 @@
 #include <wsutil/file_util.h>
 #include <wsutil/privileges.h>
 #include <wsutil/report_message.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 
 #include <wiretap/merge.h>
 
index b180b79ca29056f6e78be5e8b87ef44d9666a2a6..9b8ee56538ade9ec68517e8e67a3252620a8a5c5 100644 (file)
@@ -32,7 +32,7 @@
 #include "gui_utils.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
index a7764259262eccc847127a3161fc9105dbab53a7..4a6abe89acee37556d1b434b5d5164cf6f4d1ef6 100644 (file)
@@ -33,7 +33,7 @@
 
 #include <wsutil/file_util.h>
 #include <wsutil/str_util.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 
 #ifdef HAVE_LIBPCAP
 #include "ui/capture_ui_utils.h"
index 0dbe3a1e936f730bad18721f2d848d4a6b130e9c..8d37d857f4a23c886e767a74a9d56db722b62006 100644 (file)
@@ -28,7 +28,7 @@
 
 
 
-#include <ws_version_info.h>
+#include <version_info.h>
 
 #include "../../file.h"
 #include "../../summary.h"
index c48d727ab5e05ff277832c16b0cdfceaf7b2a6fa..25ce84edf048cf23b7f976340aa8894b5a5aafdc 100644 (file)
@@ -51,7 +51,7 @@
 #include "wsutil/tempfile.h"
 #include "wsutil/plugins.h"
 #include "wsutil/copyright_info.h"
-#include "ws_version_info.h"
+#include "version_info.h"
 
 #ifdef HAVE_EXTCAP
 #include "extcap.h"
index e7c0aad6fa56aa3ff6aa285b1c0e8c9827af33b5..e205f938b40f0926d400b2dfc5aa3a6de226ce58 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "wsutil/str_util.h"
 #include "wsutil/utf8_entities.h"
-#include "ws_version_info.h"
+#include "version_info.h"
 
 #include <ui/qt/utils/qt_ui_utils.h>
 #include "wireshark_application.h"
index c200d724e2584c2893b4cc8fd40a08a7bc67a83e..d7af6b7ee5b0c7b596fdf517d1a3b8be96e43c3d 100644 (file)
@@ -40,7 +40,7 @@
 
 #include "wsutil/file_util.h"
 #include "wsutil/str_util.h"
-#include "ws_version_info.h"
+#include "version_info.h"
 
 #include "ws_symbol_export.h"
 
index 3d8fde8cd9f36cc3a18df30ef51ec6048eddacb9..303308fca733d30a7523c1739580461f752d48ca 100644 (file)
@@ -28,7 +28,7 @@
 #include "ui/capture_globals.h"
 #include "ui/help_url.h"
 
-#include "ws_version_info.h"
+#include "version_info.h"
 
 #include "main_welcome.h"
 #include <ui_main_welcome.h>
index e7fcc9903235938cbffe1683766f8379603e42e4..eeab9fa92f71790c2824883cf67e38800983c3bd 100644 (file)
@@ -33,7 +33,7 @@ DIAG_ON(frame-larger-than=)
 #include "epan/dissector_filters.h"
 #include <epan/epan_dissect.h>
 #include <wsutil/filesystem.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 #include <epan/prefs.h>
 #include <epan/stats_tree_priv.h>
 #include <epan/plugin_if.h>
index 2e5ee3d4c2068b7b5465a1eca4574f6208fb83fb..d5e9b23a4953bfee46b9444c4960b0ded867c38d 100644 (file)
@@ -26,7 +26,7 @@
 #include "globals.h"
 #include "wiretap/pcap-encap.h"
 #include "wsutil/os_version_info.h"
-#include "ws_version_info.h"
+#include "version_info.h"
 
 #include <epan/tap.h>
 #include <epan/exported_pdu.h>
similarity index 99%
rename from ws_version_info.c
rename to version_info.c
index 7e5fed027d4b9ba593b39d1138342fa81e762d78..9aefd8da651983e51453b2e937fea1edf9e49b9d 100644 (file)
@@ -1,4 +1,4 @@
-/* ws_version_info.c
+/* version_info.c
  * Routines to report version information for Wireshark programs
  *
  * Wireshark - Network traffic analyzer
@@ -44,7 +44,7 @@
 
 #include "version.h"
 
-#include "ws_version_info.h"
+#include "version_info.h"
 
 #include <wsutil/cpu_info.h>
 #include <wsutil/copyright_info.h>
similarity index 99%
rename from ws_version_info.h
rename to version_info.h
index 6877704cfd974a7a4f2226f36311daa43c63855a..564d9c183b295a075f072392b02afde90c897dce 100644 (file)
@@ -1,4 +1,4 @@
-/* ws_version_info.h
+/* version_info.h
  * Declarations of routines to report version information for Wireshark
  * programs
  *
index 538994daefc81a43c39bac8b83e3049f21bee290..c48fa1d5d1710ae80b3e6a65dba497d2a376338e 100644 (file)
@@ -51,7 +51,7 @@
 #endif
 #include <wsutil/report_message.h>
 #include <wsutil/unicode-utils.h>
-#include <ws_version_info.h>
+#include <version_info.h>
 
 #include <epan/addr_resolv.h>
 #include <epan/ex-opt.h>
index be562b5a78963152786b5360f8e3402b28e7dbda..20a41de35569c8d1a7910f00cadf65cf487fefca 100644 (file)
@@ -90,7 +90,7 @@ set(WIRETAP_FILES
        vwr.c
        wtap.c
        wtap_opttypes.c
-       ${CMAKE_SOURCE_DIR}/ws_version_info.c
+       ${CMAKE_SOURCE_DIR}/version_info.c
 )
 
 set_source_files_properties(
index 1b67cb3adbff836e100c62def5c85507dd975db3..5448d47fdc1fe11b7d8a7bddbc0672bafdda2164 100644 (file)
@@ -189,7 +189,7 @@ GENERATED_FILES = $(GENERATED_C_FILES) $(GENERATED_HEADER_FILES)
 libwiretap_la_SOURCES = \
        $(NONGENERATED_C_FILES)         \
        $(NONGENERATED_HEADER_FILES)    \
-       ws_version_info.c
+       version_info.c
 
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
 libwiretap_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@
@@ -215,13 +215,13 @@ CLEANFILES = \
        *~
 
 DISTCLEANFILES = \
-       ws_version_info.c
+       version_info.c
 
 MAINTAINERCLEANFILES = \
        $(GENERATED_FILES)      \
        Makefile.in
 
-BUILT_SOURCES = $(GENERATED_HEADER_FILES) ws_version_info.c
+BUILT_SOURCES = $(GENERATED_HEADER_FILES) version_info.c
 
 EXTRA_DIST = \
        .editorconfig           \
@@ -244,7 +244,7 @@ ascend.c: $(srcdir)/ascend.y ascend_scanner_lex.h
        fi
        $(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) $<
 
 # ABI compliance checker can be obtained from
index 25492709403f642843d35972424c87c728aff97c..6c38572fb093849967653431de8881cdaa51d9bd 100644 (file)
@@ -42,7 +42,7 @@
 #include <wsutil/buffer.h>
 #include "wsutil/tempfile.h"
 #include "wsutil/os_version_info.h"
-#include "ws_version_info.h"
+#include "version_info.h"
 #include "wsutil/str_util.h"