diff options
author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-20 17:45:17 +0000 |
---|---|---|
committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-20 17:45:17 +0000 |
commit | 6691a701e3f56bb4871e6ef6bacf52e661581e59 (patch) | |
tree | f7dfd2aa2c1b2299a8d333403c0b1e600879d2fd /rawshark.c | |
parent | a896743c6fddd1f391e6e1838f5d116a398966e2 (diff) |
Move verbose banner output to show_version() and tighten scope of some variables
svn path=/trunk/; revision=30020
Diffstat (limited to 'rawshark.c')
-rw-r--r-- | rawshark.c | 47 |
1 files changed, 28 insertions, 19 deletions
diff --git a/rawshark.c b/rawshark.c index a3aa3bcb82..cd96ec313b 100644 --- a/rawshark.c +++ b/rawshark.c @@ -124,7 +124,6 @@ static const gchar decode_as_arg_template[] = "<layer_type>==<selector>,<decode_ static nstime_t first_ts; static nstime_t prev_dis_ts; static nstime_t prev_cap_ts; -static GString *comp_info_str, *runtime_info_str; /* * The way the packet decode is to be written. @@ -409,6 +408,20 @@ set_link_type(const char *lt_arg) { return FALSE; } +static void +show_version(GString *comp_info_str, GString *runtime_info_str) +{ + printf("Rawshark " VERSION "%s\n" + "\n" + "%s" + "\n" + "%s" + "\n" + "%s", + wireshark_svnversion, get_copyright_info(), comp_info_str->str, + runtime_info_str->str); +} + int main(int argc, char *argv[]) { @@ -568,14 +581,6 @@ main(int argc, char *argv[]) init_cap_file(&cfile); - /* Assemble the compile-time version information string */ - comp_info_str = g_string_new("Compiled "); - get_compiled_version_info(comp_info_str, get_epan_compiled_version_info); - - /* Assemble the run-time version information string */ - runtime_info_str = g_string_new("Running "); - get_runtime_version_info(runtime_info_str, NULL); - /* Print format defaults to this. */ print_format = PR_FMT_TEXT; @@ -688,18 +693,22 @@ main(int argc, char *argv[]) } break; case 'v': /* Show version and exit */ - printf("Rawshark " VERSION "%s\n" - "\n" - "%s" - "\n" - "%s" - "\n" - "%s", - wireshark_svnversion, get_copyright_info(), comp_info_str->str, - runtime_info_str->str); + { + GString *comp_info_str; + GString *runtime_info_str; + /* Assemble the compile-time version information string */ + comp_info_str = g_string_new("Compiled "); + get_compiled_version_info(comp_info_str, get_epan_compiled_version_info); + + /* Assemble the run-time version information string */ + runtime_info_str = g_string_new("Running "); + get_runtime_version_info(runtime_info_str, NULL); + show_version(comp_info_str, runtime_info_str); + g_string_free(comp_info_str, TRUE); + g_string_free(runtime_info_str, TRUE); exit(0); break; - + } default: case '?': /* Bad flag - print usage message */ print_usage(TRUE); |