diff options
author | Stephen Fisher <sfisher@sdf.org> | 2014-12-23 14:58:38 -0700 |
---|---|---|
committer | Stephen Fisher <sfisher@sdf.org> | 2014-12-24 16:51:45 +0000 |
commit | 2d8ec49ffad14a1f1ea7a71c99e617bbfd0767a9 (patch) | |
tree | 714a232ac88a3631b37398520ace89902081e42b /tshark.c | |
parent | 45daef629d249b1b632efa9fe9e1167a8cc1a936 (diff) |
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>
Diffstat (limited to 'tshark.c')
-rw-r--r-- | tshark.c | 17 |
1 files changed, 1 insertions, 16 deletions
@@ -75,7 +75,6 @@ #include <wsutil/file_util.h> #include <wsutil/filesystem.h> #include <wsutil/report_err.h> -#include <wsutil/copyright_info.h> #include <wsutil/os_version_info.h> #include <wsutil/ws_version_info.h> @@ -901,20 +900,6 @@ print_current_user(void) { } static void -show_version(GString *comp_info_str, GString *runtime_info_str) -{ - printf("TShark (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); -} - -static void get_tshark_compiled_version_info(GString *str) { /* Capture libraries */ @@ -1619,7 +1604,7 @@ main(int argc, char *argv[]) break; case 'v': /* Show version and exit */ { - show_version(comp_info_str, runtime_info_str); + show_version("TShark (Wireshark)", comp_info_str, runtime_info_str); g_string_free(comp_info_str, TRUE); g_string_free(runtime_info_str, TRUE); /* We don't really have to cleanup here, but it's a convenient way to test |