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

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

Commits:

a344c97 by Guy Harris (guy@xxxxxxxxxxxx):

    Revert "Allow wtap_read() and wtap_seek_read() to return non-packet records."
    
    This reverts commit c0c480d08c175eed4524ea9e73ec86298f468cf4.
    
    A better way to do this is to have the record type be part of struct wtap_pkthdr; that keeps the metadata for the record together and requires fewer API changes.  That is in-progress.
    
    Change-Id: Ic558f163a48e2c6d0df7f55e81a35a5e24b53bc6
    Reviewed-on: https://code.wireshark.org/review/1741
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  716fdc8   Revert "Fix some white space issues."
    adds  a344c97   Revert "Allow wtap_read() and wtap_seek_read() to return non-packet records."


Summary of changes:
 capinfos.c                    |   87 +++----
 capture.c                     |    6 +-
 capture_info.c                |   26 +-
 capture_info.h                |    4 +-
 capture_sync.c                |    2 +-
 capture_sync.h                |    4 +-
 editcap.c                     |  576 ++++++++++++++++++++---------------------
 file.c                        |   87 +++----
 file.h                        |   31 ++-
 frame_tvbuff.c                |    2 +-
 proto_hier_stats.c            |    2 +-
 reordercap.c                  |   29 +--
 tfshark.c                     |    2 +-
 tshark.c                      |  243 ++++++++---------
 ui/gtk/capture_file_dlg.c     |   35 ++-
 ui/gtk/iax2_analysis.c        |    2 +-
 ui/gtk/main.c                 |    4 +-
 ui/gtk/packet_list_store.c    |    2 +-
 ui/gtk/packet_win.c           |    2 +-
 ui/gtk/rlc_lte_graph.c        |    2 +-
 ui/gtk/rtp_analysis.c         |    2 +-
 ui/gtk/sctp_assoc_analyse.c   |    2 +-
 ui/qt/capture_file_dialog.cpp |   35 ++-
 ui/qt/packet_list.cpp         |    2 +-
 ui/qt/packet_list_model.cpp   |    2 +-
 ui/tap-tcp-stream.c           |    2 +-
 ui/win32/file_dlg_win32.c     |   41 ++-
 wiretap/5views.c              |   28 +-
 wiretap/aethra.c              |   22 +-
 wiretap/ascendtext.c          |   20 +-
 wiretap/ber.c                 |   24 +-
 wiretap/btsnoop.c             |   22 +-
 wiretap/camins.c              |   16 +-
 wiretap/catapult_dct2000.c    |   32 +--
 wiretap/commview.c            |   24 +-
 wiretap/cosine.c              |   26 +-
 wiretap/csids.c               |   20 +-
 wiretap/daintree-sna.c        |   32 +--
 wiretap/dbs-etherwatch.c      |   48 ++--
 wiretap/dct3trace.c           |   26 +-
 wiretap/erf.c                 |   34 ++-
 wiretap/eyesdn.c              |   28 +-
 wiretap/hcidump.c             |   16 +-
 wiretap/i4btrace.c            |   24 +-
 wiretap/ipfix.c               |   18 +-
 wiretap/iptrace.c             |   28 +-
 wiretap/iseries.c             |   28 +-
 wiretap/k12.c                 |   20 +-
 wiretap/k12text.l             |   16 +-
 wiretap/lanalyzer.c           |   20 +-
 wiretap/libpcap.c             |   18 +-
 wiretap/logcat.c              |   16 +-
 wiretap/mime_file.c           |   20 +-
 wiretap/mp2t.c                |   16 +-
 wiretap/mpeg.c                |   16 +-
 wiretap/netmon.c              |   32 +--
 wiretap/netscaler.c           |   94 +++----
 wiretap/netscreen.c           |   26 +-
 wiretap/nettl.c               |   18 +-
 wiretap/network_instruments.c |   30 +--
 wiretap/netxray.c             |   32 +--
 wiretap/ngsniffer.c           |   26 +-
 wiretap/packetlogger.c        |   26 +-
 wiretap/pcapng.c              |   16 +-
 wiretap/peekclassic.c         |   30 +--
 wiretap/peektagged.c          |   20 +-
 wiretap/pppdump.c             |   22 +-
 wiretap/radcom.c              |   22 +-
 wiretap/snoop.c               |   20 +-
 wiretap/stanag4607.c          |   25 +-
 wiretap/tnef.c                |   26 +-
 wiretap/toshiba.c             |   22 +-
 wiretap/visual.c              |   22 +-
 wiretap/vms.c                 |   18 +-
 wiretap/vwr.c                 |   25 +-
 wiretap/wtap-int.h            |    8 +-
 wiretap/wtap.c                |   22 +-
 wiretap/wtap.h                |   21 +-
 78 files changed, 1187 insertions(+), 1308 deletions(-)