diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-10-07 12:49:14 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-10-07 19:50:08 +0000 |
| commit | 71550ba98a38508ae90df43bddd0644b2df2f717 (patch) | |
| tree | 32705bb55493a9bbef53a9683d08d5170f71446e /wiretap/peekclassic.c | |
| parent | d98debe6d04e3b2a07c8c9a03ad3a4de54ccbc27 (diff) | |
Make the code a bit more like the pre-new-APIs code.
Change-Id: I40282d8825936d24480c9b77e2e7d9374b1de6b5
Reviewed-on: https://code.wireshark.org/review/4534
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/peekclassic.c')
| -rw-r--r-- | wiretap/peekclassic.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/wiretap/peekclassic.c b/wiretap/peekclassic.c index f1e109bbe1..cfd4c91bef 100644 --- a/wiretap/peekclassic.c +++ b/wiretap/peekclassic.c @@ -199,14 +199,9 @@ int peekclassic_open(wtap *wth, int *err, gchar **err_info) PEEKCLASSIC_V567_HDR_SIZE); if (!wtap_read_bytes(wth->fh, &ep_hdr.secondary.v567, (int)sizeof(ep_hdr.secondary.v567), err, err_info)) { - if (*err == WTAP_ERR_SHORT_READ) { - /* - * Not enough bytes for a secondary - * header, so not a Peek classic file. - */ - return 0; - } - return -1; + if (*err != WTAP_ERR_SHORT_READ) + return -1; + return 0; } if ((0 != ep_hdr.secondary.v567.reserved[0]) || |