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/lanalyzer.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/lanalyzer.c')
| -rw-r--r-- | wiretap/lanalyzer.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/wiretap/lanalyzer.c b/wiretap/lanalyzer.c index 70b0403cdd..3c3ba09ad9 100644 --- a/wiretap/lanalyzer.c +++ b/wiretap/lanalyzer.c @@ -289,7 +289,6 @@ int lanalyzer_open(wtap *wth, int *err, gchar **err_info) struct tm tm; lanalyzer_t *lanalyzer; - errno = WTAP_ERR_CANT_READ; if (!wtap_read_bytes(wth->fh, &rec_header, LA_RecordHeaderSize, err, err_info)) { if (*err != WTAP_ERR_SHORT_READ) @@ -345,7 +344,6 @@ int lanalyzer_open(wtap *wth, int *err, gchar **err_info) /* Read records until we find the start of packets */ while (1) { - errno = WTAP_ERR_CANT_READ; if (!wtap_read_bytes_or_eof(wth->fh, &rec_header, LA_RecordHeaderSize, err, err_info)) { if (*err == 0) { @@ -365,7 +363,6 @@ int lanalyzer_open(wtap *wth, int *err, gchar **err_info) switch (record_type) { /* Trace Summary Record */ case RT_Summary: - errno = WTAP_ERR_CANT_READ; if (!wtap_read_bytes(wth->fh, summary, sizeof summary, err, err_info)) return -1; @@ -449,7 +446,6 @@ static gboolean lanalyzer_read_trace_record(wtap *wth, FILE_T fh, time_t tsecs; /* read the record type and length. */ - errno = WTAP_ERR_CANT_READ; if (!wtap_read_bytes_or_eof(fh, LE_record_type, 2, err, err_info)) return FALSE; if (!wtap_read_bytes(fh, LE_record_length, 2, err, err_info)) @@ -481,7 +477,6 @@ static gboolean lanalyzer_read_trace_record(wtap *wth, FILE_T fh, record_data_size = record_length - DESCRIPTOR_LEN; /* Read the descriptor data */ - errno = WTAP_ERR_CANT_READ; if (!wtap_read_bytes(fh, descriptor, DESCRIPTOR_LEN, err, err_info)) return FALSE; |