diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-09-28 16:45:23 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-09-28 23:45:58 +0000 |
| commit | 48a66835ee4f319ba7806a542bb2cf1f16a2ac06 (patch) | |
| tree | f4b86d49b651fc55047f16d98b1c2401238e03ec /wiretap/file_wrappers.h | |
| parent | a3ce2336b2a0e684a94d1e0046556bc0b42748f2 (diff) | |
| download | wireshark-48a66835ee4f319ba7806a542bb2cf1f16a2ac06.tar.gz | |
Use wtap_read_bytes() to skip over bytes when reading a record.
Allow file_read() to take a null pointer as a buffer argument; a null
argument means "do everything except copy the bytes from the file to the
user buffer". That means that wtap_read_bytes() and
wtap_read_bytes_or_eof() also support a null pointer as a buffer
argument.
Use wtap_read_bytes() with a null buffer argument rather than
file_skip() to skip forward over data.
This fixes some places where files were mis-identified as ERF files, as
the ERF open heuristics now get a short "read" error if they try to skip
over more bytes than exist in the file.
Change-Id: I4f73499d877c1f582e2bcf9b045034880cb09622
Reviewed-on: https://code.wireshark.org/review/17974
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/file_wrappers.h')
| -rw-r--r-- | wiretap/file_wrappers.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/wiretap/file_wrappers.h b/wiretap/file_wrappers.h index a7003f8a74..d53b47c09e 100644 --- a/wiretap/file_wrappers.h +++ b/wiretap/file_wrappers.h @@ -30,7 +30,6 @@ extern FILE_T file_open(const char *path); extern FILE_T file_fdopen(int fildes); extern void file_set_random_access(FILE_T stream, gboolean random_flag, GPtrArray *seek); WS_DLL_PUBLIC gint64 file_seek(FILE_T stream, gint64 offset, int whence, int *err); -extern gboolean file_skip(FILE_T file, gint64 delta, int *err); WS_DLL_PUBLIC gint64 file_tell(FILE_T stream); extern gint64 file_tell_raw(FILE_T stream); extern int file_fstat(FILE_T stream, ws_statb64 *statb, int *err); |