From 2d8ec49ffad14a1f1ea7a71c99e617bbfd0767a9 Mon Sep 17 00:00:00 2001
From: Stephen Fisher <sfisher@sdf.org>
Date: Tue, 23 Dec 2014 14:58:38 -0700
Subject: Move twelve show_version() functions from the varoius programs and
 Wireshark UI files into a single one in wsutil.

Change-Id: I0a64f0cc8106bd681bd185289c36272c4c43baad
Reviewed-on: https://code.wireshark.org/review/6026
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
---
 mergecap.c | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

(limited to 'mergecap.c')

diff --git a/mergecap.c b/mergecap.c
index c483e8feef..9cd1d7066d 100644
--- a/mergecap.c
+++ b/mergecap.c
@@ -58,7 +58,6 @@
 #include <wsutil/file_util.h>
 #include <wsutil/cmdarg_err.h>
 #include <wsutil/crash_info.h>
-#include <wsutil/copyright_info.h>
 #include <wsutil/os_version_info.h>
 #include <wsutil/ws_version_info.h>
 
@@ -74,20 +73,6 @@
 #include <wsutil/unicode-utils.h>
 #endif /* _WIN32 */
 
-static void
-show_version(GString *comp_info_str, GString *runtime_info_str)
-{
-    printf("Mergecap (Wireshark) %s\n"
-           "\n"
-           "%s"
-           "\n"
-           "%s"
-           "\n"
-           "%s",
-           get_ws_vcs_version_info(), get_copyright_info(),
-           comp_info_str->str, runtime_info_str->str);
-}
-
 /*
  * Show the usage
  */
@@ -329,7 +314,7 @@ main(int argc, char *argv[])
       break;
 
     case 'V':
-      show_version(comp_info_str, runtime_info_str);
+      show_version("Mergecap (Wireshark)", comp_info_str, runtime_info_str);
       g_string_free(comp_info_str, TRUE);
       g_string_free(runtime_info_str, TRUE);
       exit(0);
-- 
cgit v1.2.1