osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

To squelch some compiler warnings, temporarily cast the argument to 

ws_lseek() to the appropriate type for the second argument to _lseek()
for Windows or lseek() for UN*X; ultimately, we want to call the
appropriate 64-bit-offset seek routine if available, otherwise cast the
value down and hand it to the 32-bit-offset seek routine.

svn path=/trunk/; revision=36514
This commit is contained in:
Guy Harris 2011-04-08 01:55:25 +00:00
parent ab261a3281
commit f3873931ec
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wiretap/file_wrappers.c
View File

@ -482,7 +482,12 @@ file_seek(FILE_T file, gint64 offset, int whence, int *err)
/* if within raw area while reading, just go there */
if (file->compression == UNCOMPRESSED && file->pos + offset >= file->raw) {
if (ws_lseek(file->fd, offset - file->have, SEEK_CUR) == -1) {
/* XXX - handle 64-bit offsets better */
#ifdef _WIN32
if (ws_lseek(file->fd, (long)(offset - file->have), SEEK_CUR) == -1) {
#else
if (ws_lseek(file->fd, (off_t)(offset - file->have), SEEK_CUR) == -1) {
#endif
*err = errno;
return -1;
}
@ -505,7 +510,12 @@ file_seek(FILE_T file, gint64 offset, int whence, int *err)
/* rewind, then skip to offset */
/* back up and start over */
if (ws_lseek(file->fd, file->start, SEEK_SET) == -1) {
/* XXX - handle 64-bit offsets better */
#ifdef _WIN32
if (ws_lseek(file->fd, (long)file->start, SEEK_SET) == -1) {
#else
if (ws_lseek(file->fd, (off_t)file->start, SEEK_SET) == -1) {
#endif
*err = errno;
return -1;
}