osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Guy Harris 2013-06-03 23:07:42 +00:00
parent 838e3767ce
commit e4d65e993f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wiretap/file_wrappers.c
View File

@ -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

2
wiretap/file_wrappers.h
View File

@ -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);

4
wiretap/ngsniffer.c
View File

@ -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);