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

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

Commits:

1f5f63f by Guy Harris (guy@xxxxxxxxxxxx):

    Generalize wtap_pkthdr into a structure for packet and non-packet records.
    
    Separate the stuff that any record could have from the stuff that only
    particular record types have; put the latter into a union, and put all
    that into a wtap_rec structure.
    
    Add some record-type checks as necessary.
    
    Change-Id: Id6b3486858f826fce4b096c59231f463e44bfaa2
    Reviewed-on: https://code.wireshark.org/review/25696
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  e4c5efa   CIP: Highlight correct bytes in Req/Rsp processing
    adds  1f5f63f   Generalize wtap_pkthdr into a structure for packet and non-packet records.


Summary of changes:
 capinfos.c                                       |  52 ++-
 capture_info.c                                   |  18 +-
 cfile.h                                          |   4 +-
 editcap.c                                        | 334 +++++++-------
 epan/dissectors/file-file.c                      |   8 +-
 epan/dissectors/packet-adb.c                     |   8 +-
 epan/dissectors/packet-adb_cs.c                  |  16 +-
 epan/dissectors/packet-bluetooth.c               |  10 +-
 epan/dissectors/packet-btl2cap.c                 |  48 +-
 epan/dissectors/packet-btle.c                    |   4 +-
 epan/dissectors/packet-frame.c                   | 116 +++--
 epan/dissectors/packet-ipoib.c                   |   4 +-
 epan/dissectors/packet-nettl.c                   |   2 +-
 epan/dissectors/packet-pcap_pktdata.c            |  12 +-
 epan/dissectors/packet-pcapng_block.c            |   4 +-
 epan/dissectors/packet-snort.c                   |  20 +-
 epan/dissectors/packet-sysdig-event.c            |  12 +-
 epan/epan.c                                      |  16 +-
 epan/epan.h                                      |   8 +-
 epan/frame_data.c                                |  45 +-
 epan/frame_data.h                                |   2 +-
 epan/packet.c                                    |  37 +-
 epan/packet.h                                    |   6 +-
 epan/packet_info.h                               |   2 +-
 epan/wslua/wslua.h                               |   6 +-
 epan/wslua/wslua_capture_info.c                  |   2 +-
 epan/wslua/wslua_dumper.c                        |  60 +--
 epan/wslua/wslua_file_common.h                   |   4 +-
 epan/wslua/wslua_file_handler.c                  |  18 +-
 epan/wslua/wslua_frame_info.c                    |  92 ++--
 extcap/androiddump.c                             |  36 +-
 file.c                                           | 231 ++++------
 file.h                                           |   4 +-
 frame_tvbuff.c                                   |  12 +-
 plugins/wiretap/usbdump/usbdump.c                |  32 +-
 randpkt_core/randpkt_core.c                      |  22 +-
 rawshark.c                                       |  56 +--
 reordercap.c                                     |  26 +-
 sharkd.c                                         |  62 ++-
 sharkd_session.c                                 |   2 +-
 tfshark.c                                        |  54 +--
 tools/oss-fuzzshark/fuzzshark.c                  |  18 +-
 tshark.c                                         |  44 +-
 ui/gtk/capture_file_dlg.c                        |   8 +-
 ui/gtk/iax2_analysis.c                           |   2 +-
 ui/gtk/main.c                                    |   4 +-
 ui/gtk/packet_list_store.c                       |  12 +-
 ui/gtk/packet_win.c                              |  10 +-
 ui/gtk/rtp_analysis.c                            |   2 +-
 ui/gtk/sctp_assoc_analyse.c                      |   2 +-
 ui/proto_hier_stats.c                            |  10 +-
 ui/qt/address_editor_frame.cpp                   |   2 +-
 ui/qt/bluetooth_att_server_attributes_dialog.cpp |  11 +-
 ui/qt/bluetooth_devices_dialog.cpp               |   9 +-
 ui/qt/bluetooth_hci_summary_dialog.cpp           |   9 +-
 ui/qt/capture_file_dialog.cpp                    |   8 +-
 ui/qt/iax2_analysis_dialog.cpp                   |   2 +-
 ui/qt/models/packet_list_record.cpp              |  10 +-
 ui/qt/packet_dialog.cpp                          |   7 +-
 ui/qt/packet_dialog.h                            |   2 +-
 ui/qt/packet_list.cpp                            |   2 +-
 ui/qt/rtp_analysis_dialog.cpp                    |   2 +-
 ui/qt/utils/frame_information.cpp                |   4 +-
 ui/tap-rlc-graph.c                               |   2 +-
 ui/tap-tcp-stream.c                              |   2 +-
 ui/tap_export_pdu.c                              |  31 +-
 ui/text_import.c                                 |  20 +-
 wiretap/5views.c                                 |  54 +--
 wiretap/aethra.c                                 |  40 +-
 wiretap/ascend-int.h                             |   2 +-
 wiretap/ascend.y                                 |   4 +-
 wiretap/ascendtext.c                             |  40 +-
 wiretap/atm.c                                    |  42 +-
 wiretap/atm.h                                    |   4 +-
 wiretap/ber.c                                    |  20 +-
 wiretap/btsnoop.c                                |  84 ++--
 wiretap/camins.c                                 |  18 +-
 wiretap/capsa.c                                  |  30 +-
 wiretap/catapult_dct2000.c                       |  68 +--
 wiretap/commview.c                               | 156 +++----
 wiretap/cosine.c                                 |  26 +-
 wiretap/csids.c                                  |  32 +-
 wiretap/daintree-sna.c                           |  34 +-
 wiretap/dbs-etherwatch.c                         |  34 +-
 wiretap/dct3trace.c                              |  58 +--
 wiretap/erf.c                                    | 116 ++---
 wiretap/eyesdn.c                                 |  64 +--
 wiretap/file_access.c                            |   8 +-
 wiretap/hcidump.c                                |  22 +-
 wiretap/i4btrace.c                               |  40 +-
 wiretap/ipfix.c                                  |  25 +-
 wiretap/iptrace.c                                |  82 ++--
 wiretap/iseries.c                                |  32 +-
 wiretap/json.c                                   |  20 +-
 wiretap/k12.c                                    |  62 +--
... 38 lines suppressed ...