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

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

Commits:

4f9f101 by Guy Harris (guy@xxxxxxxxxxxx):

    Speak of records, not packets.
    
    Not everything wtap_read() returns is a packet.
    
    Change-Id: I3784bbfa308da52f4c55db2a90f9b55f8bfbb2ef
    Reviewed-on: https://code.wireshark.org/review/25617
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  746511d   packet-mq: Fix a wrong offset+Add value in val_str
    adds  4f9f101   Speak of records, not packets.


Summary of changes:
 file.c          |  2 +-
 mergecap.c      |  2 +-
 wiretap/merge.c | 12 ++++++------
 wiretap/merge.h |  6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)