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 /ui | |
| 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 'ui')
| -rw-r--r-- | ui/gtk/main.c | 16 | ||||
| -rw-r--r-- | ui/qt/main.cpp | 17 |
2 files changed, 2 insertions, 31 deletions
diff --git a/ui/gtk/main.c b/ui/gtk/main.c index 83ab1fd482..6675ec29d5 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -1255,20 +1255,6 @@ print_usage(gboolean for_help_option) { #endif } -static void -show_version(void) -{ - printf("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); -} - /* * Report an error in command-line arguments. * Creates a console on Windows. @@ -2364,7 +2350,7 @@ main(int argc, char *argv[]) #ifdef _WIN32 create_console(); #endif - show_version(); + show_version("Wireshark", comp_info_str, runtime_info_str); #ifdef _WIN32 destroy_console(); #endif diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp index 8bc39b0be2..3048c92b5e 100644 --- a/ui/qt/main.cpp +++ b/ui/qt/main.cpp @@ -281,21 +281,6 @@ print_usage(gboolean for_help_option) { #endif } -// xxx copied from ../gtk/main.c -static void -show_version(void) -{ - printf("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); -} - /* * Report an error in command-line arguments. * Creates a console on Windows. @@ -693,7 +678,7 @@ int main(int argc, char *argv[]) #ifdef _WIN32 create_console(); #endif - show_version(); + show_version("Wireshark", comp_info_str, runtime_info_str); #ifdef _WIN32 destroy_console(); #endif |