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 /capinfos.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 'capinfos.c')
-rw-r--r-- | capinfos.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/capinfos.c b/capinfos.c index 59056267a1..8b4bfeaf05 100644 --- a/capinfos.c +++ b/capinfos.c @@ -84,7 +84,6 @@ #include <wsutil/privileges.h> #include <wsutil/filesystem.h> #include <wsutil/crash_info.h> -#include <wsutil/copyright_info.h> #include <wsutil/os_version_info.h> #include <wsutil/ws_version_info.h> @@ -998,20 +997,6 @@ process_cap_file(wtap *wth, const char *filename) } static void -show_version(GString *comp_info_str, GString *runtime_info_str) -{ - printf("Capinfos (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 print_usage(FILE *output) { fprintf(output, "\n"); @@ -1409,7 +1394,7 @@ main(int argc, char *argv[]) break; case 'v': - show_version(comp_info_str, runtime_info_str); + show_version("Capinfos (Wireshark)", comp_info_str, runtime_info_str); g_string_free(comp_info_str, TRUE); g_string_free(runtime_info_str, TRUE); exit(0); |