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

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

Commits:

a1b1c8b by Guy Harris (guy@xxxxxxxxxxxx):

    Revert "Refactor Wiretap"
    
    This reverts commit 1abeb277f5e6bd27fbaebfecc8184e37ba9d008a.
    
    This isn't building, and looks as if it requires significant work to fix.
    
    Change-Id: I622b1bb243e353e874883a302ab419532b7601f2
    Reviewed-on: https://code.wireshark.org/review/1568
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  a651f3e   Revert "Try to fix the build boot by changing the signature of catapult_dct2000_dump() to the declared one."
    adds  a1b1c8b   Revert "Refactor Wiretap"


Summary of changes:
 capinfos.c                    |   18 +-
 capture_info.c                |   24 +-
 captype.c                     |    6 +-
 cfile.c                       |    2 +-
 cfile.h                       |   10 +-
 editcap.c                     |   32 +--
 epan/wslua/wslua.h            |   10 +-
 epan/wslua/wslua_dumper.c     |    6 +-
 epan/wslua/wslua_file.c       |  200 ++++++++--------
 file.c                        |  158 ++++++-------
 filetap/file_access.c         |    2 +-
 filetap/ftap.c                |    8 +-
 frame_tvbuff.c                |   16 +-
 mergecap.c                    |   16 +-
 randpkt.c                     |    4 +-
 rawshark.c                    |    4 +-
 reordercap.c                  |   16 +-
 summary.c                     |    4 +-
 tfshark.c                     |   67 ++++--
 tshark.c                      |   80 +++----
 ui/gtk/capture_file_dlg.c     |   12 +-
 ui/gtk/file_import_dlg.c      |    2 +-
 ui/gtk/iax2_analysis.c        |    2 +-
 ui/gtk/main.c                 |    4 +-
 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 |    4 +-
 ui/qt/import_text_dialog.cpp  |    2 +-
 ui/qt/packet_list.cpp         |    2 +-
 ui/tap-tcp-stream.c           |    2 +-
 ui/tap_export_pdu.c           |    2 +-
 ui/tap_export_pdu.h           |    2 +-
 ui/text_import.c              |    2 +-
 ui/text_import.h              |    2 +-
 ui/win32/file_dlg_win32.c     |    6 +-
 wiretap/5views.c              |   74 +++---
 wiretap/5views.h              |    4 +-
 wiretap/CMakeLists.txt        |    2 +-
 wiretap/Makefile.common       |   13 +-
 wiretap/aethra.c              |   58 +++--
 wiretap/aethra.h              |    2 +-
 wiretap/ascendtext.c          |   77 +++----
 wiretap/ascendtext.h          |    2 +-
 wiretap/ber.c                 |   46 ++--
 wiretap/ber.h                 |    2 +-
 wiretap/btsnoop.c             |   90 ++++----
 wiretap/btsnoop.h             |    6 +-
 wiretap/camins.c              |   40 ++--
 wiretap/camins.h              |    2 +-
 wiretap/catapult_dct2000.c    |   99 ++++----
 wiretap/catapult_dct2000.h    |    4 +-
 wiretap/commview.c            |   88 ++++---
 wiretap/commview.h            |    4 +-
 wiretap/cosine.c              |   65 +++---
 wiretap/cosine.h              |    2 +-
 wiretap/csids.c               |   59 +++--
 wiretap/csids.h               |    2 +-
 wiretap/daintree-sna.c        |   51 ++---
 wiretap/daintree-sna.h        |    2 +-
 wiretap/dbs-etherwatch.c      |   57 +++--
 wiretap/dbs-etherwatch.h      |    2 +-
 wiretap/dct3trace.c           |   43 ++--
 wiretap/dct3trace.h           |    2 +-
 wiretap/erf.c                 |   88 ++++---
 wiretap/erf.h                 |    4 +-
 wiretap/eyesdn.c              |   69 +++---
 wiretap/eyesdn.h              |    4 +-
 wiretap/file_access.c         |  263 ++++++++++-----------
 wiretap/hcidump.c             |   41 ++--
 wiretap/hcidump.h             |    2 +-
 wiretap/i4btrace.c            |   49 ++--
 wiretap/i4btrace.h            |    2 +-
 wiretap/ipfix.c               |   53 ++---
 wiretap/ipfix.h               |    2 +-
 wiretap/iptrace.c             |   83 ++++---
 wiretap/iptrace.h             |    2 +-
 wiretap/iseries.c             |   94 ++++----
 wiretap/iseries.h             |    2 +-
 wiretap/k12.c                 |   83 ++++---
 wiretap/k12.h                 |    8 +-
 wiretap/k12text.l             |   55 +++--
 wiretap/lanalyzer.c           |  146 ++++++------
 wiretap/lanalyzer.h           |    4 +-
 wiretap/libpcap.c             |  169 +++++++-------
 wiretap/libpcap.h             |    4 +-
 wiretap/logcat.c              |   92 ++++----
 wiretap/logcat.h              |   20 +-
 wiretap/merge.c               |   27 ++-
 wiretap/merge.h               |    2 +-
 wiretap/mime_file.c           |   40 ++--
 wiretap/mime_file.h           |    2 +-
 wiretap/mp2t.c                |   55 +++--
 wiretap/mp2t.h                |    2 +-
... 50 lines suppressed ...