Wireshark-commits: [Wireshark-commits] master 0734ac3: Rename buffer_ routines to ws_buffer_ to avo
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sat, 2 Aug 2014 11:01:32 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=0734ac385fbf20cd350850265935a17402d05b84
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

0734ac3 by Guy Harris (guy@xxxxxxxxxxxx):

    Rename buffer_ routines to ws_buffer_ to avoid name collisions.
    
    In particular, epan/wslua/lrexlib.c has its own buffer_ routines,
    causing some linker warnings on some platforms, as reported in bug
    10332.
    
    (Not to be backported to 1.12, as that would change the API and ABI of
    libwsutil and libwiretap.  We should also make the buffer_ routines in
    epan/wslua/lrexlib.c static, which should also address this problem, but
    the name change avoids other potential namespace collisions.)
    
    Change-Id: I1d42c7d1778c7e4c019deb2608d476c52001ce28
    Reviewed-on: https://code.wireshark.org/review/3351
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  41e3225   Revert "Make Lua taps work in out-of-source-tree builds."
    adds  0734ac3   Rename buffer_ routines to ws_buffer_ to avoid name collisions.


Summary of changes:
 epan/wslua/wslua_file.c       |    8 +++----
 file.c                        |   28 +++++++++++------------
 filetap/file_access.c         |    2 +-
 filetap/ftap.c                |    8 +++----
 frame_tvbuff.c                |   10 ++++-----
 reordercap.c                  |    6 ++---
 tfshark.c                     |    4 ++--
 tshark.c                      |    6 ++---
 ui/gtk/mcast_stream_dlg.c     |    2 +-
 ui/gtk/packet_list_store.c    |    6 ++---
 ui/gtk/packet_win.c           |    2 +-
 ui/proto_hier_stats.c         |    4 ++--
 ui/qt/packet_list_record.cpp  |    6 ++---
 wiretap/ascend.y              |    4 ++--
 wiretap/camins.c              |    4 ++--
 wiretap/catapult_dct2000.c    |    4 ++--
 wiretap/cosine.c              |    4 ++--
 wiretap/csids.c               |    2 +-
 wiretap/daintree-sna.c        |    4 ++--
 wiretap/dbs-etherwatch.c      |    4 ++--
 wiretap/dct3trace.c           |    4 ++--
 wiretap/eyesdn.c              |    4 ++--
 wiretap/file_access.c         |    2 +-
 wiretap/iptrace.c             |    2 +-
 wiretap/iseries.c             |    4 ++--
 wiretap/k12.c                 |   14 ++++++------
 wiretap/k12text.l             |    8 +++----
 wiretap/libpcap.c             |    2 +-
 wiretap/logcat.c              |    4 ++--
 wiretap/mp2t.c                |    4 ++--
 wiretap/netmon.c              |    2 +-
 wiretap/netscaler.c           |   28 +++++++++++------------
 wiretap/netscreen.c           |    4 ++--
 wiretap/nettl.c               |    4 ++--
 wiretap/network_instruments.c |    2 +-
 wiretap/netxray.c             |    4 ++--
 wiretap/ngsniffer.c           |    6 ++---
 wiretap/pcapng.c              |   50 ++++++++++++++++++++---------------------
 wiretap/pppdump.c             |    8 +++----
 wiretap/snoop.c               |    2 +-
 wiretap/toshiba.c             |    4 ++--
 wiretap/visual.c              |    2 +-
 wiretap/vms.c                 |    4 ++--
 wiretap/vwr.c                 |   12 +++++-----
 wiretap/wtap.c                |    8 +++----
 wsutil/buffer.c               |   34 ++++++++++++++--------------
 wsutil/buffer.h               |   34 ++++++++++++++--------------
 47 files changed, 187 insertions(+), 187 deletions(-)