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 --- reordercap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'reordercap.c') diff --git a/reordercap.c b/reordercap.c index 9246974682..c8e1fd53a4 100644 --- a/reordercap.c +++ b/reordercap.c @@ -143,7 +143,7 @@ frame_write(FrameRecord_t *frame, wtap *wth, wtap_dumper *pdh, Buffer *buf, phdr.ts = frame->time; /* Dump frame to outfile */ - if (!wtap_dump(pdh, &phdr, buffer_start_ptr(buf), &err)) { + if (!wtap_dump(pdh, &phdr, ws_buffer_start_ptr(buf), &err)) { fprintf(stderr, "reordercap: Error (%s) writing frame to outfile\n", wtap_strerror(err)); exit(1); @@ -361,7 +361,7 @@ main(int argc, char *argv[]) } /* Write out each sorted frame in turn */ - buffer_init(&buf, 1500); + ws_buffer_init(&buf, 1500); for (i = 0; i < frames->len; i++) { FrameRecord_t *frame = (FrameRecord_t *)frames->pdata[i]; @@ -371,7 +371,7 @@ main(int argc, char *argv[]) } g_slice_free(FrameRecord_t, frame); } - buffer_free(&buf); + ws_buffer_free(&buf); if (!write_output_regardless && (wrong_order_count == 0)) { printf("Not writing output file because input file is already in order!\n"); -- cgit v1.2.3