diff options
46 files changed, 106 insertions, 72 deletions
diff --git a/.editorconfig b/.editorconfig index ae27dd7298..0cffa1f635 100644 --- a/.editorconfig +++ b/.editorconfig @@ -68,3 +68,7 @@ indent_size = 2 [randpkt_core.[ch]] indent_style = tab indent_size = tab + +[ws_version_info.[ch]] +indent_style = tab +indent_size = tab diff --git a/.gitignore b/.gitignore index 0d69824acf..cc0520d200 100644 --- a/.gitignore +++ b/.gitignore @@ -42,6 +42,7 @@ epan/register_wslua.c epan/taps.txt epan/taps_wslua.c epan/uat_load.c +epan/ws_version_info.c epan/wslua/declare_wslua.h epan/wslua/register_wslua.c epan/wslua/taps.txt @@ -57,6 +58,7 @@ tshark-tap-register.c wiretap/ascend.c wiretap/ascend.h wiretap/k12text.c +wiretap/ws_version_info.c wireshark-tap-register.c wireshark-tap-register-cache.pkl ui/gtk/wireshark-gresources.c diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a4800ae9d..fdf7bb3b16 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1257,6 +1257,7 @@ set(SHARK_COMMON_SRC cfile.c frame_tvbuff.c sync_pipe_write.c + ws_version_info.c ) # sources for external capture interfaces @@ -2135,6 +2136,7 @@ if(BUILD_randpkt) ) set(randpkt_FILES randpkt.c + ws_version_info.c ) add_executable(randpkt ${randpkt_FILES}) set_extra_executable_properties(randpkt "Executables") @@ -2151,6 +2153,7 @@ if(BUILD_text2pcap) ) set(text2pcap_CLEAN_FILES text2pcap.c + ws_version_info.c ) set(text2pcap_FILES ${text2pcap_CLEAN_FILES} @@ -2173,6 +2176,7 @@ if(BUILD_mergecap) ) set(mergecap_FILES mergecap.c + ws_version_info.c ${CMAKE_BINARY_DIR}/image/mergecap.rc ) add_executable(mergecap ${mergecap_FILES}) @@ -2189,6 +2193,7 @@ if(BUILD_reordercap) ) set(reordercap_FILES reordercap.c + ws_version_info.c ${CMAKE_BINARY_DIR}/image/reordercap.rc ) add_executable(reordercap ${reordercap_FILES}) @@ -2207,6 +2212,7 @@ if(BUILD_capinfos) ) set(capinfos_FILES capinfos.c + ws_version_info.c ${CMAKE_BINARY_DIR}/image/capinfos.rc ) add_executable(capinfos ${capinfos_FILES}) @@ -2224,6 +2230,7 @@ if(BUILD_captype) ) set(captype_FILES captype.c + ws_version_info.c ${CMAKE_BINARY_DIR}/image/captype.rc ) add_executable(captype ${captype_FILES}) @@ -2240,6 +2247,7 @@ if(BUILD_editcap) ) set(editcap_FILES editcap.c + ws_version_info.c ${CMAKE_BINARY_DIR}/image/editcap.rc ) add_executable(editcap ${editcap_FILES}) @@ -2270,6 +2278,7 @@ if(BUILD_dumpcap AND PCAP_FOUND) filter_files.c ringbuffer.c sync_pipe_write.c + ws_version_info.c ${CMAKE_BINARY_DIR}/image/dumpcap.rc ) add_executable(dumpcap ${dumpcap_FILES}) diff --git a/Makefile.common b/Makefile.common index bcdc6e195a..e18ce019e4 100644 --- a/Makefile.common +++ b/Makefile.common @@ -71,7 +71,8 @@ WIRESHARK_COMMON_SRC = \ file.c \ fileset.c \ filter_files.c \ - summary.c + summary.c \ + ws_version_info.c # corresponding headers WIRESHARK_COMMON_INCLUDES = \ @@ -88,45 +89,54 @@ tshark_SOURCES = \ $(SHARK_COMMON_SRC) \ capture_opts.c \ filter_files.c \ - tshark.c + tshark.c \ + ws_version_info.c # tfshark specifics tfshark_SOURCES = \ $(SHARK_COMMON_SRC) \ - tfshark.c + tfshark.c \ + ws_version_info.c # rawshark specifics rawshark_SOURCES = \ $(SHARK_COMMON_SRC) \ - rawshark.c + rawshark.c \ + ws_version_info.c # text2pcap specifics text2pcap_SOURCES = \ text2pcap.c \ - text2pcap-scanner.l + text2pcap-scanner.l \ + ws_version_info.c text2pcap_INCLUDES = \ text2pcap.h # mergecap specifics mergecap_SOURCES = \ - mergecap.c + mergecap.c \ + ws_version_info.c # editcap specifics editcap_SOURCES = \ - editcap.c + editcap.c \ + ws_version_info.c # reordercap specifics reordercap_SOURCES = \ - reordercap.c + reordercap.c \ + ws_version_info.c # capinfos specifics capinfos_SOURCES = \ - capinfos.c + capinfos.c \ + ws_version_info.c # captype specifics captype_SOURCES = \ - captype.c + captype.c \ + ws_version_info.c # dftest specifics dftest_SOURCES = \ @@ -144,7 +154,8 @@ echld_test_SOURCES = \ # randpkt specifics randpkt_SOURCES = \ - randpkt.c + randpkt.c \ + ws_version_info.c # dumpcap specifics dumpcap_SOURCES = \ @@ -154,7 +165,8 @@ dumpcap_SOURCES = \ dumpcap.c \ filter_files.c \ ringbuffer.c \ - sync_pipe_write.c + sync_pipe_write.c \ + ws_version_info.c # corresponding headers dumpcap_INCLUDES = \ @@ -168,4 +180,5 @@ noinst_HEADERS = \ $(EXTCAP_COMMON_INCLUDES) \ $(WIRESHARK_COMMON_INCLUDES) \ $(dumpcap_INCLUDES) \ - ws_diag_control.h + ws_diag_control.h \ + ws_version_info.h diff --git a/capinfos.c b/capinfos.c index b43f3083b0..0cd7ac0a9f 100644 --- a/capinfos.c +++ b/capinfos.c @@ -74,7 +74,7 @@ #include <wsutil/crash_info.h> #include <wsutil/filesystem.h> #include <wsutil/privileges.h> -#include <wsutil/ws_version_info.h> +#include <ws_version_info.h> #include <wiretap/wtap_opttypes.h> #include <wiretap/pcapng.h> @@ -44,7 +44,7 @@ #include <wsutil/file_util.h> #include <wsutil/filesystem.h> #include <wsutil/privileges.h> -#include <wsutil/ws_version_info.h> +#include <ws_version_info.h> #ifdef HAVE_PLUGINS #include <wsutil/plugins.h> diff --git a/configure.ac b/configure.ac index 07690a6d20..14237285ed 100644 --- a/configure.ac +++ b/configure.ac @@ -117,6 +117,7 @@ AX_PROG_CC_FOR_BUILD # AC_PROG_SED +AC_PROG_LN_S AC_PROG_MKDIR_P AC_PATH_PROG(PERL, perl) diff --git a/debian/libwsutil0.symbols b/debian/libwsutil0.symbols index d79925b196..c7e85ab410 100644 --- a/debian/libwsutil0.symbols +++ b/debian/libwsutil0.symbols @@ -55,7 +55,6 @@ libwsutil.so.0 libwsutil0 #MINVER# find_last_pathname_separator@Base 1.12.0~rc1 format_size@Base 1.10.0 get_basename@Base 1.12.0~rc1 - get_compiled_version_info@Base 1.99.2 get_copyright_info@Base 1.99.0 get_cur_groupname@Base 1.10.0 get_cur_username@Base 1.10.0 @@ -74,10 +73,8 @@ libwsutil.so.0 libwsutil0 #MINVER# get_profile_name@Base 1.12.0~rc1 get_profiles_dir@Base 1.12.0~rc1 get_progfile_dir@Base 1.12.0~rc1 - get_runtime_version_info@Base 1.99.2 get_systemfile_dir@Base 1.12.0~rc1 get_tempfile_path@Base 1.12.0~rc1 - get_ws_vcs_version_info@Base 1.99.0 has_global_profiles@Base 1.12.0~rc1 ieee80211_chan_to_mhz@Base 1.99.7 ieee80211_mhz_to_chan@Base 1.99.7 @@ -152,7 +149,6 @@ libwsutil.so.0 libwsutil0 #MINVER# sha256_hmac_update@Base 2.1.0 sha256_starts@Base 2.1.0 sha256_update@Base 2.1.0 - show_version@Base 1.99.2 sober128_add_entropy@Base 1.99.0 sober128_read@Base 1.99.0 sober128_start@Base 1.99.0 @@ -56,7 +56,7 @@ #include <wsutil/cmdarg_err.h> #include <wsutil/crash_info.h> -#include <wsutil/ws_version_info.h> +#include <ws_version_info.h> #ifndef HAVE_GETOPT_LONG #include "wsutil/wsgetopt.h" diff --git a/echld/echld-int.h b/echld/echld-int.h index fe01f83383..78c6032dc0 100644 --- a/echld/echld-int.h +++ b/echld/echld-int.h @@ -69,7 +69,7 @@ #include "wsutil/privileges.h" #include "wsutil/filesystem.h" #include "wsutil/copyright_info.h" -#include "wsutil/ws_version_info.h" +#include "ws_version_info.h" #include "epan/addr_resolv.h" #include "epan/epan.h" #include "epan/prefs.h" @@ -83,7 +83,7 @@ #include <wsutil/report_err.h> #include <wsutil/strnatcmp.h> #include <wsutil/str_util.h> -#include <wsutil/ws_version_info.h> +#include <ws_version_info.h> #include <wsutil/pint.h> #include <wiretap/wtap_opttypes.h> #include <wiretap/pcapng.h> diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index 82d0169d3e..33d63a6c02 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -168,6 +168,7 @@ set(LIBWIRESHARK_FILES uat.c value_string.c xdlc.c + ${CMAKE_SOURCE_DIR}/ws_version_info.c ) set(LIBWIRESHARK_CLEAN_FILES diff --git a/epan/Makefile.am b/epan/Makefile.am index a7af0d83a2..f16ce7ff42 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -54,7 +54,8 @@ libwireshark_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@ #files with the "stop on warning" barrier. libwireshark_la_SOURCES = \ $(LIBWIRESHARK_SRC) \ - $(LIBWIRESHARK_INCLUDES) + $(LIBWIRESHARK_INCLUDES) \ + ws_version_info.c libwireshark_la_CPPFLAGS = $(AM_CPPFLAGS) -DWS_BUILD_DLL @@ -104,7 +105,8 @@ CLEANFILES = \ DISTCLEANFILES = \ $(NODIST_LIBWIRESHARK_GENERATED_C_FILES) \ $(NODIST_LIBWIRESHARK_GENERATED_HEADER_FILES) \ - dtd_grammar.out + dtd_grammar.out \ + ws_version_info.c MAINTAINERCLEANFILES = \ $(LIBWIRESHARK_GENERATED_C_FILES) \ @@ -113,7 +115,8 @@ MAINTAINERCLEANFILES = \ BUILT_SOURCES = \ $(LIBWIRESHARK_GENERATED_HEADER_FILES) \ - $(NODIST_LIBWIRESHARK_GENERATED_HEADER_FILES) + $(NODIST_LIBWIRESHARK_GENERATED_HEADER_FILES) \ + ws_version_info.c # # Add the object files for missing routines, if any. @@ -194,6 +197,9 @@ 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 + $(LN_S) $< + tvbtest.o exntest.o oids_test.o: exceptions.h update-sminmpec: diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index 29df42fc27..8801e9d2ed 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -47,7 +47,7 @@ #include <wsutil/str_util.h> #include <wsutil/report_err.h> #include <wsutil/pint.h> -#include <wsutil/ws_version_info.h> +#include <ws_version_info.h> #include "packet-x509af.h" #include "packet-x509if.h" #include "packet-ssl-utils.h" diff --git a/epan/print.c b/epan/print.c index 4af1acb102..566af2ee2b 100644 --- a/epan/print.c +++ b/epan/print.c @@ -36,7 +36,7 @@ #include <epan/print.h> #include <epan/charsets.h> #include <wsutil/filesystem.h> -#include <wsutil/ws_version_info.h> +#include <ws_version_info.h> #include <wsutil/utf8_entities.h> #include <ftypes/ftypes-int.h> @@ -33,7 +33,7 @@ #include <wsutil/tempfile.h> #include <wsutil/file_util.h> #include <wsutil/filesystem.h> -#include <wsutil/ws_version_info.h> +#include <ws_version_info.h> #include <wiretap/merge.h> diff --git a/mergecap.c b/mergecap.c index 76edfa4f63..55ed977f95 100644 --- a/mergecap.c +++ b/mergecap.c @@ -49,7 +49,7 @@ #include <wsutil/file_util.h> #include <wsutil/privileges.h> #include <wsutil/strnatcmp.h> -#include <wsutil/ws_version_info.h> +#include <ws_version_info.h> #ifdef HAVE_PLUGINS #include <wsutil/plugins.h> diff --git a/rawshark.c b/rawshark.c index c771698309..df8185ce55 100644 --- a/rawshark.c +++ b/rawshark.c @@ -92,7 +92,7 @@ #include <wiretap/pcap-encap.h> #include <wsutil/clopts_common.h> -#include <wsutil/ws_version_info.h> +#include <ws_version_info.h> #include "caputils/capture-pcap-util.h" diff --git a/reordercap.c b/reordercap.c index 1627024a56..2bcc77ac12 100644 --- a/reordercap.c +++ b/reordercap.c @@ -42,7 +42,7 @@ #include <wsutil/filesystem.h> #include <wsutil/file_util.h> #include <wsutil/privileges.h> -#include <wsutil/ws_version_info.h> +#include <ws_version_info.h> #include <wiretap/wtap_opttypes.h> #ifdef HAVE_PLUGINS diff --git a/text2pcap.c b/text2pcap.c index 65f4a8526e..d364984d62 100644 --- a/text2pcap.c +++ b/text2pcap.c @@ -112,7 +112,7 @@ #include <string.h> #include <wsutil/file_util.h> #include <wsutil/crash_info.h> -#include <wsutil/ws_version_info.h> +#include <ws_version_info.h> #include <wsutil/inet_addr.h> #include <time.h> @@ -52,7 +52,7 @@ #include <wsutil/file_util.h> #include <wsutil/privileges.h> #include <wsutil/report_err.h> -#include <wsutil/ws_version_info.h> +#include <ws_version_info.h> #include "globals.h" #include <epan/timestamp.h> @@ -61,7 +61,7 @@ #include <wsutil/file_util.h> #include <wsutil/privileges.h> #include <wsutil/report_err.h> -#include <wsutil/ws_version_info.h> +#include <ws_version_info.h> #include <wiretap/wtap_opttypes.h> #include <wiretap/pcapng.h> diff --git a/ui/decode_as_utils.c b/ui/decode_as_utils.c index 61a9dc174e..ce66fd2ecf 100644 --- a/ui/decode_as_utils.c +++ b/ui/decode_as_utils.c @@ -37,7 +37,7 @@ #include "wsutil/file_util.h" #include "wsutil/filesystem.h" -#include "wsutil/ws_version_info.h" +#include "ws_version_info.h" /* XXX - We might want to switch this to a UAT */ diff --git a/ui/gtk/about_dlg.c b/ui/gtk/about_dlg.c index 579d3edf05..06c1d9a70b 100644 --- a/ui/gtk/about_dlg.c +++ b/ui/gtk/about_dlg.c @@ -29,7 +29,7 @@ #include <wsutil/filesystem.h> #include <wsutil/copyright_info.h> -#include <wsutil/ws_version_info.h> +#include <ws_version_info.h> #ifdef HAVE_LIBSMI #include <epan/oids.h> #endif diff --git a/ui/gtk/file_import_dlg.c b/ui/gtk/file_import_dlg.c index e901b7bd07..5a5816fd27 100644 --- a/ui/gtk/file_import_dlg.c +++ b/ui/gtk/file_import_dlg.c @@ -47,7 +47,7 @@ #include "wsutil/file_util.h" #include "wsutil/tempfile.h" #include "wsutil/os_version_info.h" -#include "wsutil/ws_version_info.h" +#include "ws_version_info.h" #include "wiretap/wtap_opttypes.h" #include "wiretap/pcapng.h" diff --git a/ui/gtk/follow_stream.c b/ui/gtk/follow_stream.c index 183453fb1d..37482e2e02 100644 --- a/ui/gtk/follow_stream.c +++ b/ui/gtk/follow_stream.c @@ -43,7 +43,7 @@ #include <ui/simple_dialog.h> #include <wsutil/file_util.h> -#include <wsutil/ws_version_info.h> +#include <ws_version_info.h> #include "gtkglobals.h" #include "ui/gtk/keys.h" diff --git a/ui/gtk/main.c b/ui/gtk/main.c index 2c1c564b56..71a4d8e15d 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -59,7 +59,7 @@ #include <wsutil/file_util.h> #include <wsutil/privileges.h> #include <wsutil/report_err.h> -#include <wsutil/ws_version_info.h> +#include <ws_version_info.h> #include <wiretap/merge.h> diff --git a/ui/gtk/main_titlebar.c b/ui/gtk/main_titlebar.c index e1728d48a3..b180b79ca2 100644 --- a/ui/gtk/main_titlebar.c +++ b/ui/gtk/main_titlebar.c @@ -32,7 +32,7 @@ #include "gui_utils.h" #include "main_titlebar.h" -#include <wsutil/ws_version_info.h> +#include <ws_version_info.h> /* * Key to attach the "un-decorated" title to the window, so that if the diff --git a/ui/gtk/main_welcome.c b/ui/gtk/main_welcome.c index b22ae2b362..696446f7b4 100644 --- a/ui/gtk/main_welcome.c +++ b/ui/gtk/main_welcome.c @@ -33,7 +33,7 @@ #include <wsutil/file_util.h> #include <wsutil/str_util.h> -#include <wsutil/ws_version_info.h> +#include <ws_version_info.h> #ifdef HAVE_LIBPCAP #include "ui/capture_ui_utils.h" diff --git a/ui/gtk/summary_dlg.c b/ui/gtk/summary_dlg.c index 84d8f9a1e4..7c52b49dd5 100644 --- a/ui/gtk/summary_dlg.c +++ b/ui/gtk/summary_dlg.c @@ -28,7 +28,7 @@ -#include <wsutil/ws_version_info.h> +#include <ws_version_info.h> #include "../../file.h" #include "../../summary.h" diff --git a/ui/qt/about_dialog.cpp b/ui/qt/about_dialog.cpp index 8752e385f3..733fc55ece 100644 --- a/ui/qt/about_dialog.cpp +++ b/ui/qt/about_dialog.cpp @@ -51,7 +51,7 @@ #include "wsutil/tempfile.h" #include "wsutil/plugins.h" #include "wsutil/copyright_info.h" -#include "wsutil/ws_version_info.h" +#include "ws_version_info.h" #ifdef HAVE_EXTCAP #include "extcap.h" diff --git a/ui/qt/capture_file_properties_dialog.cpp b/ui/qt/capture_file_properties_dialog.cpp index 5473a838f4..2d0ff87e60 100644 --- a/ui/qt/capture_file_properties_dialog.cpp +++ b/ui/qt/capture_file_properties_dialog.cpp @@ -27,7 +27,7 @@ #include "summary.h" #include "wsutil/str_util.h" -#include "wsutil/ws_version_info.h" +#include "ws_version_info.h" #include "qt_ui_utils.h" #include "wireshark_application.h" diff --git a/ui/qt/follow_stream_dialog.cpp b/ui/qt/follow_stream_dialog.cpp index 9f04263571..443d10b0e9 100644 --- a/ui/qt/follow_stream_dialog.cpp +++ b/ui/qt/follow_stream_dialog.cpp @@ -41,7 +41,7 @@ #include "wsutil/file_util.h" #include "wsutil/str_util.h" -#include "wsutil/ws_version_info.h" +#include "ws_version_info.h" #include "ws_symbol_export.h" diff --git a/ui/qt/main_welcome.cpp b/ui/qt/main_welcome.cpp index 691a457b6b..b5cb3dc878 100644 --- a/ui/qt/main_welcome.cpp +++ b/ui/qt/main_welcome.cpp @@ -27,7 +27,7 @@ #include "ui/capture_globals.h" -#include "wsutil/ws_version_info.h" +#include "ws_version_info.h" #include "main_welcome.h" #include <ui_main_welcome.h> diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp index 4b37a5ffed..da39acaaa3 100644 --- a/ui/qt/main_window.cpp +++ b/ui/qt/main_window.cpp @@ -26,7 +26,7 @@ #include "epan/dissector_filters.h" #include <epan/epan_dissect.h> #include <wsutil/filesystem.h> -#include <wsutil/ws_version_info.h> +#include <ws_version_info.h> #include <epan/prefs.h> #include <epan/stats_tree_priv.h> #include <epan/plugin_if.h> diff --git a/ui/tap_export_pdu.c b/ui/tap_export_pdu.c index e0b2a9fc3c..608e4a1acb 100644 --- a/ui/tap_export_pdu.c +++ b/ui/tap_export_pdu.c @@ -27,7 +27,7 @@ #include "wiretap/pcap-encap.h" #include "wsutil/tempfile.h" #include "wsutil/os_version_info.h" -#include "wsutil/ws_version_info.h" +#include "ws_version_info.h" #include <epan/tap.h> #include <epan/exported_pdu.h> diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp index 9b45ec6371..5f038aeaa1 100644 --- a/wireshark-qt.cpp +++ b/wireshark-qt.cpp @@ -45,7 +45,7 @@ #endif #include <wsutil/report_err.h> #include <wsutil/unicode-utils.h> -#include <wsutil/ws_version_info.h> +#include <ws_version_info.h> #include <epan/addr_resolv.h> #include <epan/ex-opt.h> diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt index 883106a58c..72b2d0daec 100644 --- a/wiretap/CMakeLists.txt +++ b/wiretap/CMakeLists.txt @@ -81,6 +81,7 @@ set(WIRETAP_FILES vwr.c wtap.c wtap_opttypes.c + ${CMAKE_SOURCE_DIR}/ws_version_info.c ) if (WERROR_COMMON_FLAGS) diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am index 597e77d27b..6414645942 100644 --- a/wiretap/Makefile.am +++ b/wiretap/Makefile.am @@ -36,6 +36,9 @@ CLEANFILES = \ libwiretap_generated.la \ *~ +DISTCLEANFILES = \ + ws_version_info.c + MAINTAINERCLEANFILES = \ $(GENERATED_FILES) \ Makefile.in @@ -46,14 +49,15 @@ MAINTAINERCLEANFILES = \ #files with the "stop on warning" barrier. libwiretap_la_SOURCES = \ $(NONGENERATED_C_FILES) \ - $(NONGENERATED_HEADER_FILES) + $(NONGENERATED_HEADER_FILES) \ + ws_version_info.c libwiretap_generated_la_SOURCES = \ $(GENERATED_C_FILES) libwiretap_generated_la_CFLAGS = $(GENERATED_CFLAGS) -BUILT_SOURCES = $(GENERATED_HEADER_FILES) +BUILT_SOURCES = $(GENERATED_HEADER_FILES) ws_version_info.c EXTRA_DIST = \ .editorconfig \ @@ -82,6 +86,9 @@ 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 + $(LN_S) $< + # ABI compliance checker can be obtained from # http://ispras.linux-foundation.org/index.php/ABI_compliance_checker # Checked using version 1.21.12 diff --git a/wiretap/nettrace_3gpp_32_423.c b/wiretap/nettrace_3gpp_32_423.c index 1b388b3b15..a93ff1d9ac 100644 --- a/wiretap/nettrace_3gpp_32_423.c +++ b/wiretap/nettrace_3gpp_32_423.c @@ -42,7 +42,7 @@ #include <wsutil/buffer.h> #include "wsutil/tempfile.h" #include "wsutil/os_version_info.h" -#include "wsutil/ws_version_info.h" +#include "ws_version_info.h" #include "wsutil/str_util.h" diff --git a/wsutil/ws_version_info.c b/ws_version_info.c index 84c2edd06c..944a5798a0 100644 --- a/wsutil/ws_version_info.c +++ b/ws_version_info.c @@ -39,7 +39,7 @@ #include "version.h" -#include <wsutil/ws_version_info.h> +#include "ws_version_info.h" #include <wsutil/ws_cpuid.h> #include <wsutil/copyright_info.h> diff --git a/wsutil/ws_version_info.h b/ws_version_info.h index b2cf6b3b6c..ec5b1da621 100644 --- a/wsutil/ws_version_info.h +++ b/ws_version_info.h @@ -21,10 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __WSUTIL_WS_VERSION_INFO_H__ -#define __WSUTIL_WS_VERSION_INFO_H__ +#ifndef __WS_VERSION_INFO_H__ +#define __WS_VERSION_INFO_H__ -#include "ws_symbol_export.h" +#include <glib.h> #ifdef __cplusplus extern "C" { @@ -43,7 +43,7 @@ extern "C" { * at the end of the string, as we currently don't use Portaudio in * TShark. */ -WS_DLL_PUBLIC GString *get_compiled_version_info(void (*prepend_info)(GString *), +GString *get_compiled_version_info(void (*prepend_info)(GString *), void (*append_info)(GString *)); /* @@ -55,19 +55,19 @@ WS_DLL_PUBLIC GString *get_compiled_version_info(void (*prepend_info)(GString *) * Portaudio information at the end of the string, as we currently * don't use Portaudio in TShark. */ -WS_DLL_PUBLIC GString *get_runtime_version_info(void (*additional_info)(GString *)); +GString *get_runtime_version_info(void (*additional_info)(GString *)); -WS_DLL_PUBLIC void show_version(const gchar *prog_name, GString *comp_info_str, GString *runtime_info_str); +void show_version(const gchar *prog_name, GString *comp_info_str, GString *runtime_info_str); /* * Return a version number string for Wireshark, including, for builds * from a tree checked out from Wireshark's version control system, * something identifying what version was checked out. */ -WS_DLL_PUBLIC const char *get_ws_vcs_version_info(void); +const char *get_ws_vcs_version_info(void); #ifdef __cplusplus } #endif /* __cplusplus */ -#endif /* __WSUTIL_WS_VERSION_INFO_H__ */ +#endif /* __WS_VERSION_INFO_H__ */ diff --git a/wsutil/.editorconfig b/wsutil/.editorconfig index dc741c0777..f7f11b64f5 100644 --- a/wsutil/.editorconfig +++ b/wsutil/.editorconfig @@ -132,9 +132,5 @@ indent_size = tab [ws_mempbrk_sse42.[ch]] indent_size = 2 -[ws_version_info.[ch]] -indent_style = tab -indent_size = tab - [wsgetopt.[ch]] indent_size = 2 diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt index 9eeda808bc..209787a658 100644 --- a/wsutil/CMakeLists.txt +++ b/wsutil/CMakeLists.txt @@ -75,7 +75,6 @@ set(WSUTIL_FILES type_util.c unicode-utils.c ws_mempbrk.c - ws_version_info.c ${WSUTIL_PLATFORM_FILES} ) diff --git a/wsutil/Makefile.common b/wsutil/Makefile.common index 9f96db7f43..4913be54fd 100644 --- a/wsutil/Makefile.common +++ b/wsutil/Makefile.common @@ -71,8 +71,7 @@ LIBWSUTIL_COMMON_SRC = \ time_util.c \ type_util.c \ unicode-utils.c \ - ws_mempbrk.c \ - ws_version_info.c + ws_mempbrk.c # Header files that don't declare replacement functions for functions # present in the APIs/ABIs of some, but not all, targets. @@ -129,8 +128,7 @@ libwsutil_nonrepl_INCLUDES = \ utf8_entities.h \ ws_cpuid.h \ ws_mempbrk.h \ - ws_mempbrk_int.h \ - ws_version_info.h + ws_mempbrk_int.h # Header files that are not generated from other files LIBWSUTIL_COMMON_INCLUDES = \ diff --git a/wsutil/Makefile.nmake b/wsutil/Makefile.nmake index 015aab89a0..36d06523e4 100644 --- a/wsutil/Makefile.nmake +++ b/wsutil/Makefile.nmake @@ -31,7 +31,8 @@ OBJECTS = file_util.obj \ $(LIBWSUTIL_SRC:.c=.obj) \ popcount.obj \ strptime.obj \ - ws_mempbrk_sse42.obj + ws_mempbrk_sse42.obj \ + ..\ws_version_info.obj # For use when making libwsutil.dll libwsutil.lib: libwsutil.dll @@ -50,7 +51,7 @@ libwsutil.dll : $(OBJECTS) ..\image\libwsutil.res # The following target will rebuild its obj # if and when version.h should change. # -ws_version_info.obj: ..\version.h +..\ws_version_info.obj: ..\version.h clean: rm -f $(OBJECTS) \ |