diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-10-06 18:00:57 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-10-07 01:01:59 +0000 |
| commit | 670ebda4a6af0d30e033b0af48cfd15ce52c10eb (patch) | |
| tree | b092e44c944c4eb7566964da4cfb914e6002bd6d /wiretap/i4btrace.c | |
| parent | 6397ad43c2374ebde388041f2bd7ac925606a51e (diff) | |
| download | wireshark-670ebda4a6af0d30e033b0af48cfd15ce52c10eb.tar.gz | |
Add some higher-level file-read APIs and use them.
Add wtap_read_bytes(), which takes a FILE_T, a pointer, a byte count, an
error number pointer, and an error string pointer as arguments, and that
treats a short read of any sort, including a read that returns 0 bytes,
as a WTAP_ERR_SHORT_READ error, and that returns the error number and
string through its last two arguments.
Add wtap_read_bytes_or_eof(), which is similar, but that treats a read
that returns 0 bytes as an EOF, supplying an error number of 0 as an EOF
indication.
Use those in file readers; that simplifies the code and makes it less
likely that somebody will fail to supply the error number and error
string on a file read error.
Change-Id: Ia5dba2a6f81151e87b614461349d611cffc16210
Reviewed-on: https://code.wireshark.org/review/4512
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/i4btrace.c')
| -rw-r--r-- | wiretap/i4btrace.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/wiretap/i4btrace.c b/wiretap/i4btrace.c index d7fe2c7067..4f7f241b42 100644 --- a/wiretap/i4btrace.c +++ b/wiretap/i4btrace.c @@ -50,17 +50,14 @@ static int i4b_read_rec(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, int i4btrace_open(wtap *wth, int *err, gchar **err_info) { - int bytes_read; i4b_trace_hdr_t hdr; gboolean byte_swapped = FALSE; i4btrace_t *i4btrace; /* I4B trace files have no magic in the header... Sigh */ errno = WTAP_ERR_CANT_READ; - bytes_read = file_read(&hdr, sizeof(hdr), wth->fh); - if (bytes_read != sizeof(hdr)) { - *err = file_error(wth->fh, err_info); - if (*err != 0 && *err != WTAP_ERR_SHORT_READ) + if (!wtap_read_bytes(wth->fh, &hdr, sizeof(hdr), err, err_info)) { + if (*err != WTAP_ERR_SHORT_READ) return -1; return 0; } @@ -143,19 +140,11 @@ i4b_read_rec(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, Buffer *buf, { i4btrace_t *i4btrace = (i4btrace_t *)wth->priv; i4b_trace_hdr_t hdr; - int bytes_read; guint32 length; errno = WTAP_ERR_CANT_READ; - bytes_read = file_read(&hdr, sizeof hdr, fh); - if (bytes_read != sizeof hdr) { - *err = file_error(fh, err_info); - if (*err == 0 && bytes_read != 0) { - /* Read something, but not enough */ - *err = WTAP_ERR_SHORT_READ; - } + if (!wtap_read_bytes_or_eof(fh, &hdr, sizeof hdr, err, err_info)) return FALSE; - } if (i4btrace->byte_swapped) { /* |