path: root/tfshark.c
diff options
authorGuy Harris <guy@alum.mit.edu>2014-08-02 04:00:48 -0700
committerGuy Harris <guy@alum.mit.edu>2014-08-02 11:01:29 +0000
commit0734ac385fbf20cd350850265935a17402d05b84 (patch)
treedfe612dc7d522330bb4d7eb49e97d0fc73026dc7 /tfshark.c
parent41e322594bf5b0281e1f8ea317c1970dfc6b1954 (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 'tfshark.c')
1 files changed, 2 insertions, 2 deletions
diff --git a/tfshark.c b/tfshark.c
index 6ac6fe06da..a3a0a0c0e4 100644
--- a/tfshark.c
+++ b/tfshark.c
@@ -1867,7 +1867,7 @@ load_cap_file(capture_file *cf, int max_packet_count, gint64 max_byte_count)
prev_dis = NULL;
prev_cap = NULL;
- buffer_init(&buf, 1500);
+ ws_buffer_init(&buf, 1500);
if (do_dissection) {
gboolean create_proto_tree;
@@ -1902,7 +1902,7 @@ load_cap_file(capture_file *cf, int max_packet_count, gint64 max_byte_count)
edt = NULL;
- buffer_free(&buf);
+ ws_buffer_free(&buf);
else {
framenum = 0;