diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-10-07 16:18:47 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-10-07 23:19:56 +0000 |
| commit | a566f617d8f712a8f4d1fe7b6d9b9f6ebe79ba11 (patch) | |
| tree | 1730a9b5c9cc7704273e4104a426e6987f9ef9b6 /wiretap/nettl.c | |
| parent | 5e0e4fa9e4de39f9402e6472e6b25439f8464c24 (diff) | |
| download | wireshark-a566f617d8f712a8f4d1fe7b6d9b9f6ebe79ba11.tar.gz | |
No need for WTAP_ERR_CANT_READ.
Unlike the standard I/O routines, the code we introduced that supports
fast random seeking on gzipped files will always supply some specific
error code for read errors, so we don't need WTAP_ERR_CANT_READ.
Add WTAP_ERR_CANT_WRITE for writing, as we're still using the standard
I/O routines for that. Set errno to WTAP_ERR_CANT_WRITE before calling
fwrite() in wtap_dump_file_write(), so that it's used if fwrite() fails
without setting errno.
Change-Id: I6bf066a6838284a532737aa65fd0c9bb3639ad63
Reviewed-on: https://code.wireshark.org/review/4540
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/nettl.c')
| -rw-r--r-- | wiretap/nettl.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/wiretap/nettl.c b/wiretap/nettl.c index 1752225278..b45652d4c4 100644 --- a/wiretap/nettl.c +++ b/wiretap/nettl.c @@ -195,7 +195,6 @@ int nettl_open(wtap *wth, int *err, gchar **err_info) memset(&file_hdr, 0, sizeof(file_hdr)); /* Read in the string that should be at the start of a HP file */ - errno = WTAP_ERR_CANT_READ; if (!wtap_read_bytes(wth->fh, file_hdr.magic, MAGIC_SIZE, err, err_info)) { if (*err != WTAP_ERR_SHORT_READ) return -1; @@ -341,7 +340,6 @@ nettl_read_rec(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, Buffer *buf, int bytes_to_read; guint8 *pd; - errno = WTAP_ERR_CANT_READ; if (!wtap_read_bytes_or_eof(fh, &rec_hdr.hdr_len, sizeof rec_hdr.hdr_len, err, err_info)) return FALSE; @@ -586,7 +584,6 @@ nettl_read_rec(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, Buffer *buf, */ ws_buffer_assure_space(buf, datalen); pd = ws_buffer_start_ptr(buf); - errno = WTAP_ERR_CANT_READ; if (fddihack) { /* read in FC, dest, src, DSAP and SSAP */ bytes_to_read = 15; |