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/eyesdn.c | |
| parent | 5e0e4fa9e4de39f9402e6472e6b25439f8464c24 (diff) | |
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/eyesdn.c')
| -rw-r--r-- | wiretap/eyesdn.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/wiretap/eyesdn.c b/wiretap/eyesdn.c index 0c024e9c76..2c815d62f1 100644 --- a/wiretap/eyesdn.c +++ b/wiretap/eyesdn.c @@ -140,7 +140,6 @@ int eyesdn_open(wtap *wth, int *err, gchar **err_info) char magic[EYESDN_HDR_MAGIC_SIZE]; /* Look for eyesdn header */ - errno = WTAP_ERR_CANT_READ; if (!wtap_read_bytes(wth->fh, &magic, sizeof magic, err, err_info)) { if (*err != WTAP_ERR_SHORT_READ) return -1; @@ -325,7 +324,6 @@ read_eyesdn_rec(FILE_T fh, struct wtap_pkthdr *phdr, Buffer *buf, int *err, /* Make sure we have enough room for the packet */ ws_buffer_assure_space(buf, EYESDN_MAX_PACKET_LEN); - errno = WTAP_ERR_CANT_READ; pd = ws_buffer_start_ptr(buf); if (!esc_read(fh, pd, pkt_len, err, err_info)) return FALSE; |