From 27be466c9b6ac1bdd62a5b86bf9c684ac55482ee Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Tue, 30 Dec 2014 22:28:25 -0800 Subject: 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 --- rawshark.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'rawshark.c') diff --git a/rawshark.c b/rawshark.c index 5b6363f881..00c805defe 100644 --- a/rawshark.c +++ b/rawshark.c @@ -454,13 +454,11 @@ main(int argc, char *argv[]) cmdarg_err_init(rawshark_cmdarg_err, rawshark_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, epan_get_compiled_version_info); + /* Get the compile-time version information string */ + comp_info_str = get_compiled_version_info(NULL, epan_get_compiled_version_info); - /* Assemble the run-time version information string */ - runtime_info_str = g_string_new("Running "); - get_runtime_version_info(runtime_info_str, NULL); + /* Get the run-time version information string */ + runtime_info_str = get_runtime_version_info(NULL); /* Add it to the information to be reported on a crash. */ ws_add_crash_info("Rawshark (Wireshark) %s\n" -- cgit v1.2.3