From 71550ba98a38508ae90df43bddd0644b2df2f717 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Tue, 7 Oct 2014 12:49:14 -0700 Subject: 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 --- wiretap/packetlogger.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'wiretap/packetlogger.c') diff --git a/wiretap/packetlogger.c b/wiretap/packetlogger.c index 8526cddada..c8235fd5f8 100644 --- a/wiretap/packetlogger.c +++ b/wiretap/packetlogger.c @@ -67,14 +67,9 @@ int packetlogger_open(wtap *wth, int *err, gchar **err_info) } if (!wtap_read_bytes(wth->fh, &type, 1, err, err_info)) { - if (*err == WTAP_ERR_SHORT_READ) { - /* - * Not enough bytes for the packet, so not a - * packetlogger file. - */ - return 0; - } - return -1; + if (*err != WTAP_ERR_SHORT_READ) + return -1; + return 0; } /* Verify this file belongs to us */ -- cgit v1.2.1