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 /filetap | |
| 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 'filetap')
| -rw-r--r-- | filetap/file_access.c | 2 | ||||
| -rw-r--r-- | filetap/ftap.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/filetap/file_access.c b/filetap/file_access.c index d3bf37fc40..01de115943 100644 --- a/filetap/file_access.c +++ b/filetap/file_access.c @@ -730,7 +730,7 @@ ftap* ftap_open_offline(const char *filename, int *err, char **err_info, success: fth->frame_buffer = (struct Buffer *)g_malloc(sizeof(struct Buffer)); - buffer_init(fth->frame_buffer, 1500); + ws_buffer_init(fth->frame_buffer, 1500); return fth; } diff --git a/filetap/ftap.c b/filetap/ftap.c index 11d79b904d..4f57082635 100644 --- a/filetap/ftap.c +++ b/filetap/ftap.c @@ -311,7 +311,7 @@ ftap_sequential_close(ftap *fth) } if (fth->frame_buffer) { - buffer_free(fth->frame_buffer); + ws_buffer_free(fth->frame_buffer); g_free(fth->frame_buffer); fth->frame_buffer = NULL; } @@ -431,9 +431,9 @@ ftap_read_packet_bytes(FILE_F fh, Buffer *buf, guint length, int *err, { int bytes_read; - buffer_assure_space(buf, length); + ws_buffer_assure_space(buf, length); errno = FTAP_ERR_CANT_READ; - bytes_read = file_read(buffer_start_ptr(buf), length, fh); + bytes_read = file_read(ws_buffer_start_ptr(buf), length, fh); if (bytes_read < 0 || (guint)bytes_read != length) { *err = file_error(fh, err_info); @@ -464,7 +464,7 @@ wtap_phdr(wtap *wth) guint8 * wtap_buf_ptr(wtap *wth) { - return buffer_start_ptr(wth->frame_buffer); + return ws_buffer_start_ptr(wth->frame_buffer); } #endif |