wsutil: New API to gather compile/runtime info

1 files changed, 8 insertions, 10 deletions

diff --git a/tshark.c b/tshark.c
index 6ab5b449c8..3971fac16f 100644
--- a/tshark.c
+++ b/tshark.c
@@ -587,23 +587,22 @@ print_current_user(void)
 }
 
 static void
-get_tshark_compiled_version_info(GString *str)
+gather_tshark_compile_info(feature_list l)
 {
     /* Capture libraries */
-    get_compiled_caplibs_version(str);
+    gather_caplibs_compile_info(l);
+    epan_gather_compile_info(l);
 }
 
 static void
-get_tshark_runtime_version_info(GString *str)
+gather_tshark_runtime_info(feature_list l)
 {
 #ifdef HAVE_LIBPCAP
-    /* Capture libraries */
-    g_string_append(str, ", ");
-    get_runtime_caplibs_version(str);
+    gather_caplibs_runtime_info(l);
 #endif
 
     /* stuff used by libwireshark */
-    epan_get_runtime_version_info(str);
+    epan_gather_runtime_info(l);
 }
 
 static void
@@ -866,9 +865,8 @@ main(int argc, char *argv[])
 #endif /* _WIN32 */
 
     /* Initialize the version information. */
-    ws_init_version_info("TShark (Wireshark)", get_tshark_compiled_version_info,
-            epan_get_compiled_version_info,
-            get_tshark_runtime_version_info);
+    ws_init_version_info("TShark",
+            gather_tshark_compile_info, gather_tshark_runtime_info);
 
     /* Fail sometimes. Useful for testing fuzz scripts. */
     /* if (g_random_int_range(0, 100) < 5) abort(); */