diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-12-27 22:59:39 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-12-27 22:59:39 +0000 |
| commit | d8b37bafb761f9feaacf5bc6a3aad7e5254159f9 (patch) | |
| tree | 60a112f6e043dc3420d353f1d86b5ee1a30edd2c /wiretap/eyesdn.c | |
| parent | bb3b34d7bfd1e8510b478fe4ad7a7ba0079ab1b0 (diff) | |
Errors take precedence over EOF; use file_error() after operations that
return an "EOF or error" indication - an EOF without an error will
return 0.
In iseries_seek_next_packet(), return an error code of WTAP_ERR_BAD_FILE
and an appropriate error message if we don't find a packet header within
the next ISERIES_MAX_TRACE_LEN lines, don't just return -1 and leave the
error information unchanged.
Setting an argument variable before returning has no effect, so don't do
it (so that we don't leave the mistaken impression that it *is* doing
something).
Clean up indentation.
svn path=/trunk/; revision=46819
Diffstat (limited to 'wiretap/eyesdn.c')
| -rw-r--r-- | wiretap/eyesdn.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/wiretap/eyesdn.c b/wiretap/eyesdn.c index fc25ad344b..c32f5b86bf 100644 --- a/wiretap/eyesdn.c +++ b/wiretap/eyesdn.c @@ -121,13 +121,8 @@ static gint64 eyesdn_seek_next_packet(wtap *wth, int *err, gchar **err_info) return cur_off; } } - if (file_eof(wth->fh)) { - /* We got an EOF. */ - *err = 0; - } else { - /* We got an error. */ - *err = file_error(wth->fh, err_info); - } + /* EOF or error. */ + *err = file_error(wth->fh, err_info); return -1; } |