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>

1 files changed, 17 insertions, 13 deletions

diff --git a/wsutil/ws_version_info.h b/wsutil/ws_version_info.h
index 03f57fc92d..b2cf6b3b6c 100644
--- a/wsutil/ws_version_info.h
+++ b/wsutil/ws_version_info.h
@@ -31,27 +31,31 @@ extern "C" {
 #endif /* __cplusplus */
 
 /*
- * Get various library compile-time versions and append them to
- * the specified GString.
+ * Get various library compile-time versions, put them in a GString,
+ * and return the GString.
  *
  * "prepend_info" is called at the start to prepend any additional
- * information.
+ * information before the standard library information.
  *
  * "append_info" is called at the end to append any additional
- * information; this is required in order to, for example, put the
- * Portaudio information at the end of the string, as we currently
- * don't use Portaudio in TShark.
+ * information after the standard library information.  This is
+ * required in order to, for example, put the Portaudio information
+ * at the end of the string, as we currently don't use Portaudio in
+ * TShark.
  */
-WS_DLL_PUBLIC void get_compiled_version_info(GString *str,
-    void (*prepend_info)(GString *),
-    void (*append_info)(GString *));
+WS_DLL_PUBLIC GString *get_compiled_version_info(void (*prepend_info)(GString *),
+                                                 void (*append_info)(GString *));
 
 /*
- * Get various library run-time versions, and the OS version, and append
- * them to the specified GString.
+ * Get various library run-time versions, and the OS version, put them in
+ * a GString, and return the GString.
+ *
+ * "additional_info" is called at the end to append any additional
+ * information; this is required in order to, for example, put the
+ * Portaudio information at the end of the string, as we currently
+ * don't use Portaudio in TShark.
  */
-WS_DLL_PUBLIC void get_runtime_version_info(GString *str,
-    void (*additional_info)(GString *));
+WS_DLL_PUBLIC GString *get_runtime_version_info(void (*additional_info)(GString *));
 
 WS_DLL_PUBLIC void show_version(const gchar *prog_name, GString *comp_info_str, GString *runtime_info_str);