diff options
author | Peter Wu <peter@lekensteyn.nl> | 2019-01-12 19:21:26 +0100 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2019-01-12 20:45:18 +0000 |
commit | fd8ddbabab923f76daddf6225c61efd90c2255a6 (patch) | |
tree | d342afa133b828ff836432e2767148b65064ba38 | |
parent | 7bb2c2e6bc222595c42dc02cbbb51fd9932eebcb (diff) |
wiretap: remove dependency on version_info
Avoid including the precise version string in the pcapng file that is
created for 3GPP TS 32.423 formats. This avoids unnecessarily relinking
of applications depending on wiretap.
Change-Id: Ida1f3c0c998d811cbf85734bd83438bcbfc39cf4
Reviewed-on: https://code.wireshark.org/review/31513
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r-- | wiretap/CMakeLists.txt | 1 | ||||
-rw-r--r-- | wiretap/nettrace_3gpp_32_423.c | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt index 2728f6673b..bf1e313d77 100644 --- a/wiretap/CMakeLists.txt +++ b/wiretap/CMakeLists.txt @@ -107,7 +107,6 @@ set_source_files_properties( add_library(wiretap ${WIRETAP_FILES} - $<TARGET_OBJECTS:version_info> ${CMAKE_BINARY_DIR}/image/wiretap.rc ) diff --git a/wiretap/nettrace_3gpp_32_423.c b/wiretap/nettrace_3gpp_32_423.c index 9f1c570ad7..e33c6cf7e2 100644 --- a/wiretap/nettrace_3gpp_32_423.c +++ b/wiretap/nettrace_3gpp_32_423.c @@ -24,7 +24,6 @@ #include "wtap-int.h" #include "file_wrappers.h" #include "pcap-encap.h" -#include "version_info.h" #include <wsutil/buffer.h> #include "wsutil/tempfile.h" @@ -863,9 +862,10 @@ create_temp_pcapng_file(wtap *wth, int *err, gchar **err_info, nettrace_3gpp_32_ /* * UTF-8 string containing the name of the application used to create - * this section. + * this section. Avoid the precise version (get_appname_and_version) to + * avoid wiretap rebuilds when only the version changes. */ - wtap_block_add_string_option_format(shb_hdr, OPT_SHB_USERAPPL, "%s", get_appname_and_version()); + wtap_block_add_string_option_format(shb_hdr, OPT_SHB_USERAPPL, "Wireshark %s", VERSION); /* Add header to the array */ g_array_append_val(shb_hdrs, shb_hdr); |