From 1871fb2b0d9628707661776cfa1b35f210e5e58e Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Mon, 6 Apr 2015 12:14:25 -0700 Subject: Keep a captured-packet count in a capture_session and use that. Have the count in a cfile_t structure always reflect the actual number of packets that have been read from the file, rather than, when doing a non-update-list-of-packets-in-real-time capture, falsely increasing the count in the cfile_t to reflect the number of packets captured but not yet read. Have the status bar base its captured-packet count on the count in the capture_session structure, and base the "sorry, no packets were captured" message on the count in the capture_session structure, as we're no longer using the count in the cfile_t structure to count anything in the process of a non-update-list-of-packets-in-real-time capture. That way, we preserve the invariant that the "frames" member of a cfile_t will be non-null if the "count" member is non-zero, fixing bug 6217. It also means we can get rid of cf_set_packet_count(), as we only set the count in the capture-file-reading code. Bug: 6217 Change-Id: I72c0e2c07c30782bad777995370b7c19e1460cc2 Reviewed-on: https://code.wireshark.org/review/7950 Reviewed-by: Guy Harris --- file.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'file.h') diff --git a/file.h b/file.h index f844594a98..b34617c61b 100644 --- a/file.h +++ b/file.h @@ -315,14 +315,6 @@ const gchar *cf_get_tempfile_source(capture_file *cf); */ int cf_get_packet_count(capture_file *cf); -/** - * Set the number of packets in the capture file. - * - * @param cf the capture file - * @param packet_count the number of packets in the capture file - */ -void cf_set_packet_count(capture_file *cf, int packet_count); - /** * Is this capture file a temporary file? * -- cgit v1.2.3