From 0734ac385fbf20cd350850265935a17402d05b84 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sat, 2 Aug 2014 04:00:48 -0700 Subject: 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 --- wiretap/iseries.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'wiretap/iseries.c') diff --git a/wiretap/iseries.c b/wiretap/iseries.c index f0c32f255e..ba1dd628ec 100644 --- a/wiretap/iseries.c +++ b/wiretap/iseries.c @@ -836,9 +836,9 @@ iseries_parse_packet (wtap * wth, FILE_T fh, struct wtap_pkthdr *phdr, phdr->caplen = ((guint32) strlen (ascii_buf))/2; /* Make sure we have enough room for the packet. */ - buffer_assure_space (buf, ISERIES_MAX_PACKET_LEN); + ws_buffer_assure_space (buf, ISERIES_MAX_PACKET_LEN); /* Convert ascii data to binary and return in the frame buffer */ - iseries_parse_hex_string (ascii_buf, buffer_start_ptr (buf), strlen (ascii_buf)); + iseries_parse_hex_string (ascii_buf, ws_buffer_start_ptr (buf), strlen (ascii_buf)); /* free buffer allocs and return */ *err = 0; -- cgit v1.2.1