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 --- captype.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'captype.c') diff --git a/captype.c b/captype.c index 0f52b044b3..bc09e2d777 100644 --- a/captype.c +++ b/captype.c @@ -139,13 +139,11 @@ main(int argc, char *argv[]) char *init_progfile_dir_error; #endif - /* Assemble the compile-time version information string */ - comp_info_str = g_string_new("Compiled "); - get_compiled_version_info(comp_info_str, NULL, get_captype_compiled_info); + /* Get the compile-time version information string */ + comp_info_str = get_compiled_version_info(NULL, get_captype_compiled_info); - /* Assemble the run-time version information string */ - runtime_info_str = g_string_new("Running "); - get_runtime_version_info(runtime_info_str, get_captype_runtime_info); + /* Get the run-time version information string */ + runtime_info_str = get_runtime_version_info(get_captype_runtime_info); /* Add it to the information to be reported on a crash. */ ws_add_crash_info("Captype (Wireshark) %s\n" -- cgit v1.2.3