From 43dfd45faa8af0b239a671b25ab6a398fa32f5c6 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Wed, 12 Dec 2018 18:16:15 -0800 Subject: Move more version-info-related stuff to version_info.c. Have a ws_init_version_info() routine that, given an application name string: constructs the app-name-and-version-information string, and saves it; adds the initial crash information on platforms that support it, and saves it. Have show_version() use the saved information and take no arguments. Add a show_help_header() routine to print the header for --help command-line options, given a description of the application; it prints the application name and version information, the description, and the "See {wireshark.org URL}" line. Use those routines in various places, including providing the "application name" string in pcapng SHBs. Change-Id: I0042a8fcc91aa919ad5c381a8b8674a007ce66df Reviewed-on: https://code.wireshark.org/review/31029 Petri-Dish: Guy Harris Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris --- ui/tap_export_pdu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ui/tap_export_pdu.c') diff --git a/ui/tap_export_pdu.c b/ui/tap_export_pdu.c index 5b8165de70..25232f0452 100644 --- a/ui/tap_export_pdu.c +++ b/ui/tap_export_pdu.c @@ -119,7 +119,7 @@ exp_pdu_open(exp_pdu_t *exp_pdu_tap_data, int fd, char *comment) * UTF-8 string containing the name of the application used to create * this section. */ - wtap_block_add_string_option_format(shb_hdr, OPT_SHB_USERAPPL, "Wireshark %s", get_ws_vcs_version_info()); + wtap_block_add_string_option_format(shb_hdr, OPT_SHB_USERAPPL, "%s", get_appname_and_version()); /* Create fake IDB info */ exp_pdu_tap_data->idb_inf = g_new(wtapng_iface_descriptions_t,1); -- cgit v1.2.3