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

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

Commits:

d4dab16 by Guy Harris (guy@xxxxxxxxxxxx):

    Only one buffer.c, please.
    
    Otherwise, if you link with both libwiretap and libfiletap, it's
    anybody's guess which one you get.  That means you're wasting memory
    with two copies of its routines if they're identical, and means
    surprising behavior if they're not (which showed up when I was debugging
    a double-free crash - fixing libwiretap's buffer_free() didn't fix the
    problem, because Wireshark happened to be calling libfiletap' unfixed
    buffer_free()).
    
    There's nothing *tap-specific about Buffers, anyway, so it really
    belongs in wsutil.
    
    Change-Id: I91537e46917e91277981f8f3365a2c0873152870
    Reviewed-on: https://code.wireshark.org/review/3066
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  61ac815   No more README.irix.
    adds  d4dab16   Only one buffer.c, please.


Summary of changes:
 filetap/CMakeLists.txt        |    1 -
 filetap/Makefile.common       |    2 -
 filetap/file_access.c         |    2 +-
 filetap/ftap.c                |    2 +-
 filetap/ftap.h                |    2 +-
 wiretap/5views.c              |    2 +-
 wiretap/CMakeLists.txt        |    1 -
 wiretap/Makefile.common       |    2 -
 wiretap/aethra.c              |    2 +-
 wiretap/ascend.y              |    2 +-
 wiretap/ascendtext.c          |    2 +-
 wiretap/ber.c                 |    2 +-
 wiretap/btsnoop.c             |    2 +-
 wiretap/buffer.c              |  162 -----------------------------------------
 wiretap/buffer.h              |   72 ------------------
 wiretap/camins.c              |    2 +-
 wiretap/catapult_dct2000.c    |    2 +-
 wiretap/commview.c            |    2 +-
 wiretap/cosine.c              |    2 +-
 wiretap/csids.c               |    2 +-
 wiretap/daintree-sna.c        |    2 +-
 wiretap/dbs-etherwatch.c      |    2 +-
 wiretap/dct3trace.c           |    2 +-
 wiretap/erf.c                 |    2 +-
 wiretap/eyesdn.c              |    2 +-
 wiretap/file_access.c         |    2 +-
 wiretap/hcidump.c             |    2 +-
 wiretap/i4btrace.c            |    2 +-
 wiretap/ipfix.c               |    2 +-
 wiretap/iptrace.c             |    2 +-
 wiretap/iseries.c             |    2 +-
 wiretap/k12.c                 |    2 +-
 wiretap/k12text.l             |    2 +-
 wiretap/lanalyzer.c           |    2 +-
 wiretap/libpcap.c             |    2 +-
 wiretap/logcat.c              |    2 +-
 wiretap/mime_file.c           |    2 +-
 wiretap/mp2t.c                |    2 +-
 wiretap/mpeg.c                |    2 +-
 wiretap/netmon.c              |    2 +-
 wiretap/netscaler.c           |    2 +-
 wiretap/netscreen.c           |    2 +-
 wiretap/nettl.c               |    2 +-
 wiretap/network_instruments.c |    2 +-
 wiretap/netxray.c             |    2 +-
 wiretap/ngsniffer.c           |    2 +-
 wiretap/packetlogger.c        |    2 +-
 wiretap/pcapng.c              |    2 +-
 wiretap/peekclassic.c         |    2 +-
 wiretap/peektagged.c          |    2 +-
 wiretap/pppdump.c             |    2 +-
 wiretap/radcom.c              |    2 +-
 wiretap/snoop.c               |    2 +-
 wiretap/stanag4607.c          |    2 +-
 wiretap/tnef.c                |    2 +-
 wiretap/toshiba.c             |    2 +-
 wiretap/visual.c              |    2 +-
 wiretap/vms.c                 |    2 +-
 wiretap/vwr.c                 |    2 +-
 wiretap/wtap.c                |    2 +-
 wiretap/wtap.h                |    2 +-
 wsutil/CMakeLists.txt         |    1 +
 wsutil/Makefile.common        |    2 +
 {filetap => wsutil}/buffer.c  |    0
 {filetap => wsutil}/buffer.h  |    0
 65 files changed, 58 insertions(+), 295 deletions(-)
 delete mode 100644 wiretap/buffer.c
 delete mode 100644 wiretap/buffer.h
 rename {filetap => wsutil}/buffer.c (100%)
 rename {filetap => wsutil}/buffer.h (100%)