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

1 files changed, 2 insertions, 7 deletions

diff --git a/wiretap/toshiba.c b/wiretap/toshiba.c
index dea3d7c6d6..07f00eb373 100644
--- a/wiretap/toshiba.c
+++ b/wiretap/toshiba.c
@@ -145,13 +145,8 @@ static gint64 toshiba_seek_next_packet(wtap *wth, int *err, gchar **err_info)
       level = 0;
     }
   }
-  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;
 }