diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-08-02 04:00:48 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-08-02 11:01:29 +0000 |
| commit | 0734ac385fbf20cd350850265935a17402d05b84 (patch) | |
| tree | dfe612dc7d522330bb4d7eb49e97d0fc73026dc7 /wiretap/netxray.c | |
| parent | 41e322594bf5b0281e1f8ea317c1970dfc6b1954 (diff) | |
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@alum.mit.edu>
Diffstat (limited to 'wiretap/netxray.c')
| -rw-r--r-- | wiretap/netxray.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/netxray.c b/wiretap/netxray.c index 49e810ad61..d8704d9fa0 100644 --- a/wiretap/netxray.c +++ b/wiretap/netxray.c @@ -1640,7 +1640,7 @@ netxray_guess_atm_type(wtap *wth, struct wtap_pkthdr *phdr, Buffer *buf) * Try to guess the type and subtype based * on the VPI/VCI and packet contents. */ - pd = buffer_start_ptr(buf); + pd = ws_buffer_start_ptr(buf); atm_guess_traffic_type(phdr, pd); } else if (phdr->pseudo_header.atm.aal == AAL_5 && phdr->pseudo_header.atm.type == TRAF_LANE) { @@ -1648,7 +1648,7 @@ netxray_guess_atm_type(wtap *wth, struct wtap_pkthdr *phdr, Buffer *buf) * Try to guess the subtype based on the * packet contents. */ - pd = buffer_start_ptr(buf); + pd = ws_buffer_start_ptr(buf); atm_guess_lane_type(phdr, pd); } } |