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/snoop.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/snoop.c')
| -rw-r--r-- | wiretap/snoop.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/wiretap/snoop.c b/wiretap/snoop.c index 9d17570389..b8c64f9de9 100644 --- a/wiretap/snoop.c +++ b/wiretap/snoop.c @@ -253,7 +253,6 @@ int snoop_open(wtap *wth, int *err, gchar **err_info) gint64 saved_offset; /* Read in the string that should be at the start of a "snoop" file */ - 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; @@ -265,7 +264,6 @@ int snoop_open(wtap *wth, int *err, gchar **err_info) } /* Read the rest of the header. */ - errno = WTAP_ERR_CANT_READ; if (!wtap_read_bytes(wth->fh, &hdr, sizeof hdr, err, err_info)) return -1; @@ -321,7 +319,6 @@ int snoop_open(wtap *wth, int *err, gchar **err_info) /* Read first record header. */ saved_offset = file_tell(wth->fh); - errno = WTAP_ERR_CANT_READ; if (!wtap_read_bytes_or_eof(wth->fh, &rec_hdr, sizeof rec_hdr, err, err_info)) { if (*err != 0) return -1; @@ -482,7 +479,6 @@ snoop_read_packet(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, int header_size; /* Read record header. */ - errno = WTAP_ERR_CANT_READ; if (!wtap_read_bytes_or_eof(fh, &hdr, sizeof hdr, err, err_info)) return -1; @@ -629,7 +625,6 @@ snoop_read_atm_pseudoheader(FILE_T fh, union wtap_pseudo_header *pseudo_header, guint8 vpi; guint16 vci; - errno = WTAP_ERR_CANT_READ; if (!wtap_read_bytes(fh, &atm_phdr, sizeof atm_phdr, err, err_info)) return FALSE; @@ -716,7 +711,6 @@ snoop_read_shomiti_wireless_pseudoheader(FILE_T fh, shomiti_wireless_header whdr; int rsize; - errno = WTAP_ERR_CANT_READ; if (!wtap_read_bytes(fh, &whdr, sizeof whdr, err, err_info)) return FALSE; |