diff options
| author | Bill Meier <wmeier@newsguy.com> | 2012-12-05 16:19:12 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2012-12-05 16:19:12 +0000 |
| commit | 95a64a667d5683bca11087ba5cc5d074f7d93945 (patch) | |
| tree | 5eaefaf80d8bfe730649d8cbe9dd03d810de524a /wiretap | |
| parent | fed92f6ee24828765d7824063baee5ef72f9ebb2 (diff) | |
| download | wireshark-95a64a667d5683bca11087ba5cc5d074f7d93945.tar.gz | |
Fix another instance of a variable/parameter name "shadowing" a library function name;
(At least some (gcc ?) compilers give a "shadow" warning for these).
svn path=/trunk/; revision=46404
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/file_wrappers.c | 10 | ||||
| -rw-r--r-- | wiretap/file_wrappers.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/wiretap/file_wrappers.c b/wiretap/file_wrappers.c index 7e89bb6fbd..6ba1588b83 100644 --- a/wiretap/file_wrappers.c +++ b/wiretap/file_wrappers.c @@ -890,8 +890,8 @@ file_open(const char *path) return ft; } -void -file_set_random_access(FILE_T stream, gboolean random _U_, GPtrArray *seek) +void +file_set_random_access(FILE_T stream, gboolean random_flag _U_, GPtrArray *seek) { stream->fast_seek = seek; } @@ -1029,7 +1029,7 @@ 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 (file->compression == UNCOMPRESSED && file->pos + offset >= file->raw && (offset < 0 || offset >= file->have) /* seek only when we don't have that offset in buffer */) { if (ws_lseek64(file->fd, offset - file->have, SEEK_CUR) == -1) { @@ -1124,7 +1124,7 @@ file_iscompressed(FILE_T stream) return stream->is_compressed; } -int +int file_read(void *buf, unsigned int len, FILE_T file) { unsigned got, n; @@ -1271,7 +1271,7 @@ file_gets(char *buf, int len, FILE_T file) return str; } -int +int file_eof(FILE_T file) { /* return end-of-file state */ diff --git a/wiretap/file_wrappers.h b/wiretap/file_wrappers.h index f39f7ed467..e95f857fe5 100644 --- a/wiretap/file_wrappers.h +++ b/wiretap/file_wrappers.h @@ -29,7 +29,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, GPtrArray *seek); +extern void file_set_random_access(FILE_T stream, gboolean random_flag, GPtrArray *seek); extern gint64 file_seek(FILE_T stream, gint64 offset, int whence, int *err); extern gint64 file_skip(FILE_T file, gint64 delta, int *err); extern gint64 file_tell(FILE_T stream); |