aboutsummaryrefslogtreecommitdiffstats
path: root/dumpcap.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2014-12-30 22:28:25 -0800
committerGuy Harris <guy@alum.mit.edu>2014-12-31 06:29:11 +0000
commit27be466c9b6ac1bdd62a5b86bf9c684ac55482ee (patch)
treeef81ff7dfb56101e3e1ce762c9a6a2c671c8d54d /dumpcap.c
parent84110d2981fbc017ef3771e8c051054b6546bc1f (diff)
Do the full string in get_{compiled,runtime}_version_info().
Have them start the string with "Compiled" or "Running on", and return the string when done. Change-Id: Ic4d290c963621fa0385dc5aab766fd4ad31d3810 Reviewed-on: https://code.wireshark.org/review/6155 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'dumpcap.c')
-rw-r--r--dumpcap.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/dumpcap.c b/dumpcap.c
index 5e32a4d3a3..9aae11b54b 100644
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -4249,13 +4249,11 @@ main(int argc, char *argv[])
cmdarg_err_init(dumpcap_cmdarg_err, dumpcap_cmdarg_err_cont);
- /* Assemble the compile-time version information string */
- comp_info_str = g_string_new("Compiled ");
- get_compiled_version_info(comp_info_str, NULL, get_dumpcap_compiled_info);
+ /* Get the compile-time version information string */
+ comp_info_str = get_compiled_version_info(NULL, get_dumpcap_compiled_info);
- /* Assemble the run-time version information string */
- runtime_info_str = g_string_new("Running ");
- get_runtime_version_info(runtime_info_str, get_dumpcap_runtime_info);
+ /* Get the run-time version information string */
+ runtime_info_str = get_runtime_version_info(get_dumpcap_runtime_info);
/* Add it to the information to be reported on a crash. */
ws_add_crash_info("Dumpcap (Wireshark) %s\n"