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/5views.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/5views.c')
| -rw-r--r-- | wiretap/5views.c | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/wiretap/5views.c b/wiretap/5views.c index 8576c726d8..a2f5364283 100644 --- a/wiretap/5views.c +++ b/wiretap/5views.c @@ -112,15 +112,13 @@ static gboolean _5views_dump_close(wtap_dumper *wdh, int *err); int _5views_open(wtap *wth, int *err, gchar **err_info) { - int bytes_read; t_5VW_Capture_Header Capture_Header; int encap = WTAP_ENCAP_UNKNOWN; errno = WTAP_ERR_CANT_READ; - bytes_read = file_read(&Capture_Header.Info_Header, sizeof(t_5VW_Info_Header), wth->fh); - if (bytes_read != sizeof(t_5VW_Info_Header)) { - *err = file_error(wth->fh, err_info); - if (*err != 0 && *err != WTAP_ERR_SHORT_READ) + if (!wtap_read_bytes(wth->fh, &Capture_Header.Info_Header, + sizeof(t_5VW_Info_Header), err, err_info)) { + if (*err != WTAP_ERR_SHORT_READ) return -1; return 0; } @@ -171,13 +169,9 @@ int _5views_open(wtap *wth, int *err, gchar **err_info) } /* read the remaining header information */ - bytes_read = file_read(&Capture_Header.HeaderDateCreation, sizeof (t_5VW_Capture_Header) - sizeof(t_5VW_Info_Header), wth->fh); - if (bytes_read != sizeof (t_5VW_Capture_Header)- sizeof(t_5VW_Info_Header) ) { - *err = file_error(wth->fh, err_info); - if (*err == 0) - *err = WTAP_ERR_SHORT_READ; + if (!wtap_read_bytes(wth->fh, &Capture_Header.HeaderDateCreation, + sizeof (t_5VW_Capture_Header) - sizeof(t_5VW_Info_Header), err, err_info)) return -1; - } /* This is a 5views capture file */ wth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_5VIEWS; @@ -270,19 +264,10 @@ static gboolean _5views_read_header(wtap *wth, FILE_T fh, t_5VW_TimeStamped_Header *hdr, struct wtap_pkthdr *phdr, int *err, gchar **err_info) { - int bytes_read, bytes_to_read; - - bytes_to_read = sizeof(t_5VW_TimeStamped_Header); - /* Read record header. */ - bytes_read = file_read(hdr, bytes_to_read, fh); - if (bytes_read != bytes_to_read) { - *err = file_error(fh, err_info); - if (*err == 0 && bytes_read != 0) { - *err = WTAP_ERR_SHORT_READ; - } + if (!wtap_read_bytes_or_eof(fh, hdr, (unsigned int)sizeof(t_5VW_TimeStamped_Header), + err, err_info)) return FALSE; - } hdr->Key = pletoh32(&hdr->Key); if (hdr->Key != CST_5VW_RECORDS_HEADER_KEY) { |