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>

5 files changed, 10 insertions, 10 deletions

diff --git a/ui/gtk/mcast_stream_dlg.c b/ui/gtk/mcast_stream_dlg.c
index e9c45f479b..f13859fb90 100644
--- a/ui/gtk/mcast_stream_dlg.c
+++ b/ui/gtk/mcast_stream_dlg.c
@@ -58,7 +58,7 @@ void register_tap_listener_mcast_stream_dlg(void);
 /* Capture callback data keys */
 #define E_MCAST_ENTRY_1     "burst_interval"
 #define E_MCAST_ENTRY_2     "burst_alarm"
-#define E_MCAST_ENTRY_3     "buffer_alarm"
+#define E_MCAST_ENTRY_3     "ws_buffer_alarm"
 #define E_MCAST_ENTRY_4     "stream_speed"
 #define E_MCAST_ENTRY_5     "total_speed"
 
diff --git a/ui/gtk/packet_list_store.c b/ui/gtk/packet_list_store.c
index 6a3c77a4e2..58f9493864 100644
--- a/ui/gtk/packet_list_store.c
+++ b/ui/gtk/packet_list_store.c
@@ -1116,7 +1116,7 @@ packet_list_dissect_and_cache_record(PacketList *packet_list, PacketListRecord *
 	} else
 		cinfo = NULL;
 
-	buffer_init(&buf, 1500);
+	ws_buffer_init(&buf, 1500);
 	if (!cf_read_record_r(&cfile, fdata, &phdr, &buf)) {
 		/*
 		 * Error reading the record.
@@ -1138,7 +1138,7 @@ packet_list_dissect_and_cache_record(PacketList *packet_list, PacketListRecord *
 			fdata->color_filter = NULL;
 			record->colorized = TRUE;
 		}
-		buffer_free(&buf);
+		ws_buffer_free(&buf);
 		return;	/* error reading the record */
 	}
 
@@ -1175,7 +1175,7 @@ packet_list_dissect_and_cache_record(PacketList *packet_list, PacketListRecord *
 		record->colorized = TRUE;
 
 	epan_dissect_cleanup(&edt);
-	buffer_free(&buf);
+	ws_buffer_free(&buf);
 }
 
 void
diff --git a/ui/gtk/packet_win.c b/ui/gtk/packet_win.c
index 189ce8af90..dd0e324cab 100644
--- a/ui/gtk/packet_win.c
+++ b/ui/gtk/packet_win.c
@@ -974,7 +974,7 @@ void new_packet_window(GtkWidget *w _U_, gboolean reference, gboolean editable _
 	DataPtr->frame = fd;
 	DataPtr->phdr  = cfile.phdr;
 	DataPtr->pd = (guint8 *)g_malloc(DataPtr->frame->cap_len);
-	memcpy(DataPtr->pd, buffer_start_ptr(&cfile.buf), DataPtr->frame->cap_len);
+	memcpy(DataPtr->pd, ws_buffer_start_ptr(&cfile.buf), DataPtr->frame->cap_len);
 
 	epan_dissect_init(&(DataPtr->edt), DataPtr->epan, TRUE, TRUE);
 	epan_dissect_run(&(DataPtr->edt), cfile.cd_t, &DataPtr->phdr,
diff --git a/ui/proto_hier_stats.c b/ui/proto_hier_stats.c
index fd4adbd333..c083de2fec 100644
--- a/ui/proto_hier_stats.c
+++ b/ui/proto_hier_stats.c
@@ -146,7 +146,7 @@ process_record(frame_data *frame, column_info *cinfo, ph_stats_t* ps)
 	memset(&phdr, 0, sizeof(struct wtap_pkthdr));
 
 	/* Load the record from the capture file */
-	buffer_init(&buf, 1500);
+	ws_buffer_init(&buf, 1500);
 	if (!cf_read_record_r(&cfile, frame, &phdr, &buf))
 		return FALSE;	/* failure */
 
@@ -170,7 +170,7 @@ process_record(frame_data *frame, column_info *cinfo, ph_stats_t* ps)
 
 	/* Free our memory. */
 	epan_dissect_cleanup(&edt);
-	buffer_free(&buf);
+	ws_buffer_free(&buf);
 
 	return TRUE;	/* success */
 }
diff --git a/ui/qt/packet_list_record.cpp b/ui/qt/packet_list_record.cpp
index 2bad6f8032..b5c50a979d 100644
--- a/ui/qt/packet_list_record.cpp
+++ b/ui/qt/packet_list_record.cpp
@@ -98,7 +98,7 @@ void PacketListRecord::dissect(capture_file *cap_file, bool dissect_color)
         cinfo = &cap_file->cinfo;
     }
 
-    buffer_init(&buf, 1500);
+    ws_buffer_init(&buf, 1500);
     if (!cf_read_record_r(cap_file, fdata_, &phdr, &buf)) {
         /*
          * Error reading the record.
@@ -119,7 +119,7 @@ void PacketListRecord::dissect(capture_file *cap_file, bool dissect_color)
             fdata_->color_filter = NULL;
             colorized_ = TRUE;
         }
-        buffer_free(&buf);
+        ws_buffer_free(&buf);
         return;    /* error reading the record */
     }
 
@@ -155,7 +155,7 @@ void PacketListRecord::dissect(capture_file *cap_file, bool dissect_color)
     }
 
     epan_dissect_cleanup(&edt);
-    buffer_free(&buf);
+    ws_buffer_free(&buf);
 }
 
 //#define MINIMIZE_STRING_COPYING 1