aboutsummaryrefslogtreecommitdiffstats
path: root/echld
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 /echld
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 'echld')
-rw-r--r--echld/dispatcher.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/echld/dispatcher.c b/echld/dispatcher.c
index 6788e27038..20e59753f6 100644
--- a/echld/dispatcher.c
+++ b/echld/dispatcher.c
@@ -482,11 +482,9 @@ static void preinit_epan(char* argv0, int (*main)(int, char **)) {
error = init_progfile_dir(argv0, main);
- comp_info_str = g_string_new("Compiled ");
- get_compiled_version_info(comp_info_str, NULL, epan_get_compiled_version_info);
+ comp_info_str = get_compiled_version_info(NULL, epan_get_compiled_version_info);
- runtime_info_str = g_string_new("Running ");
- get_runtime_version_info(runtime_info_str, NULL);
+ runtime_info_str = get_runtime_version_info(NULL);
version_long_str = g_strdup_printf("Echld %s\n%s\n%s\n%s",
get_ws_vcs_version_info(), get_copyright_info(),