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 /frame_tvbuff.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 'frame_tvbuff.c')
| -rw-r--r-- | frame_tvbuff.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/frame_tvbuff.c b/frame_tvbuff.c index b47d206f07..c577f4693a 100644 --- a/frame_tvbuff.c +++ b/frame_tvbuff.c @@ -80,13 +80,13 @@ frame_cache(struct tvb_frame *frame_tvb) frame_tvb->buf = (struct Buffer *) g_malloc(sizeof(struct Buffer)); /* XXX, register frame_tvb to some list which frees from time to time not used buffers :] */ - buffer_init(frame_tvb->buf, frame_tvb->tvb.length + frame_tvb->offset); + ws_buffer_init(frame_tvb->buf, frame_tvb->tvb.length + frame_tvb->offset); if (!frame_read(frame_tvb, &phdr, frame_tvb->buf)) { /* TODO: THROW(???); */ } } - frame_tvb->tvb.real_data = buffer_start_ptr(frame_tvb->buf) + frame_tvb->offset; + frame_tvb->tvb.real_data = ws_buffer_start_ptr(frame_tvb->buf) + frame_tvb->offset; } static void @@ -95,7 +95,7 @@ frame_free(tvbuff_t *tvb) struct tvb_frame *frame_tvb = (struct tvb_frame *) tvb; if (frame_tvb->buf) { - buffer_free(frame_tvb->buf); + ws_buffer_free(frame_tvb->buf); g_free(frame_tvb->buf); } @@ -231,7 +231,7 @@ frame_tvbuff_new(const frame_data *fd, const guint8 *buf) tvbuff_t * frame_tvbuff_new_buffer(const frame_data *fd, Buffer *buf) { - return frame_tvbuff_new(fd, buffer_start_ptr(buf)); + return frame_tvbuff_new(fd, ws_buffer_start_ptr(buf)); } static tvbuff_t * @@ -336,5 +336,5 @@ file_tvbuff_new(const frame_data *fd, const guint8 *buf) tvbuff_t * file_tvbuff_new_buffer(const frame_data *fd, Buffer *buf) { - return frame_tvbuff_new(fd, buffer_start_ptr(buf)); + return frame_tvbuff_new(fd, ws_buffer_start_ptr(buf)); } |