diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-02-20 01:19:42 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-02-20 01:19:42 +0000 |
| commit | bd4cffae586b5207aae62dcb8a55690b23e42dd0 (patch) | |
| tree | 5f89150713a57eb73ee3e5721481a6ac4637eb27 /capinfos.c | |
| parent | cf1070b4b12e97a7b2c233bdc966e7ff3972acb5 (diff) | |
| download | wireshark-bd4cffae586b5207aae62dcb8a55690b23e42dd0.tar.gz | |
When any of our executables start on Windows create or open a "Wireshark
is running" mutex. Have the NSIS installer check for this mutex and ask
the user to close Wireshark if it's found. While not perfect this makes
the WinSparkle update process much less annoying.
svn path=/trunk/; revision=47758
Diffstat (limited to 'capinfos.c')
| -rw-r--r-- | capinfos.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/capinfos.c b/capinfos.c index 96d7de998a..246afb3443 100644 --- a/capinfos.c +++ b/capinfos.c @@ -155,7 +155,7 @@ static gboolean cap_file_hashes = TRUE; /* Calculate file hashes */ #ifdef USE_GOPTION static gboolean cap_help = FALSE; static gboolean table_report = FALSE; - + static GOptionEntry general_entries[] = { /* General */ @@ -490,7 +490,7 @@ print_stats(const gchar *filename, capture_info *cf_info) } if (cap_packet_size) printf ("Average packet size: %.2f bytes\n", cf_info->packet_size); if (cf_info->times_known) { - if (cap_packet_rate) + if (cap_packet_rate) print_value("Average packet rate: ", 2, " packets/sec", cf_info->packet_rate); } #ifdef HAVE_LIBGCRYPT @@ -1022,6 +1022,7 @@ main(int argc, char *argv[]) #ifdef _WIN32 arg_list_utf_16to8(argc, argv); + create_app_running_mutex(); #endif /* _WIN32 */ /* @@ -1044,7 +1045,7 @@ main(int argc, char *argv[]) /* Process the options */ #ifdef USE_GOPTION ctx = g_option_context_new(" <infile> ... - print information about capture file(s)"); - general_grp = g_option_group_new("gen", "General infos:", + general_grp = g_option_group_new("gen", "General infos:", "Show general options", NULL, NULL); size_grp = g_option_group_new("size", "Size infos:", "Show size options", NULL, NULL); |