Wireshark · Wireshark-commits: [Wireshark-commits] master 1871fb2: Keep a captured-packet count in a capture_session and use that.

[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=1871fb2b0d9628707661776cfa1b35f210e5e58e
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

1871fb2 by Guy Harris (guy@xxxxxxxxxxxx):

    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 <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  b23ab90   unistim: remove tvb_length deprecated API
    adds  1871fb2   Keep a captured-packet count in a capture_session and use that.


Summary of changes:
 capchild/capture_session.h |    1 +
 capchild/capture_sync.c    |    2 ++
 file.c                     |    7 -------
 file.h                     |    8 --------
 ui/capture.c               |   10 ++--------
 ui/gtk/main_statusbar.c    |    4 +---
 6 files changed, 6 insertions(+), 26 deletions(-)