diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-06-03 23:07:42 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-06-03 23:07:42 +0000 |
| commit | e4d65e993f4b1b7fff370357a20b6a0c7a80e4ef (patch) | |
| tree | cf28d2cf6c664cd77bbff45a391ce20cf676fcf2 /wiretap | |
| parent | 838e3767ceb2f20a39f5f6aa77ded4628b22fe21 (diff) | |
file_skip() only needs to return a Boolean; if anybody cares what the
seek offset is after calling it, they can use file_tell(). (Some
routines were already assuming it returned a gboolean.)
svn path=/trunk/; revision=49733
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/file_wrappers.c | 6 | ||||
| -rw-r--r-- | wiretap/file_wrappers.h | 2 | ||||
| -rw-r--r-- | wiretap/ngsniffer.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/wiretap/file_wrappers.c b/wiretap/file_wrappers.c index c670c6e696..973b2a19f7 100644 --- a/wiretap/file_wrappers.c +++ b/wiretap/file_wrappers.c @@ -1104,10 +1104,12 @@ file_seek(FILE_T file, gint64 offset, int whence, int *err) * sequentially from a pipe, this could instead just skip * forward by reading the bytes in question. */ -gint64 +gboolean file_skip(FILE_T file, gint64 delta, int *err) { - return file_seek(file, delta, SEEK_CUR, err); + if (file_seek(file, delta, SEEK_CUR, err) == -1) + return FALSE; + return TRUE; } gint64 diff --git a/wiretap/file_wrappers.h b/wiretap/file_wrappers.h index 3de26aaefa..1c96f15f86 100644 --- a/wiretap/file_wrappers.h +++ b/wiretap/file_wrappers.h @@ -32,7 +32,7 @@ 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 gint64 file_skip(FILE_T file, gint64 delta, 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); diff --git a/wiretap/ngsniffer.c b/wiretap/ngsniffer.c index 92e451dcef..9ac755d295 100644 --- a/wiretap/ngsniffer.c +++ b/wiretap/ngsniffer.c @@ -2654,9 +2654,7 @@ ng_file_skip_seq(wtap *wth, gint64 delta, int *err, gchar **err_info) if (wth->file_type == WTAP_FILE_NGSNIFFER_UNCOMPRESSED) { ngsniffer->seq.uncomp_offset += delta; - if (file_skip(wth->fh, delta, err) == -1) - return FALSE; - return TRUE; + return file_skip(wth->fh, delta, err); } g_assert(delta >= 0); |