diff options
author | Guy Harris <guy@alum.mit.edu> | 2012-12-28 09:10:59 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2012-12-28 09:10:59 +0000 |
commit | c6ede6cf558693879b636c880ee17b60556b2b6d (patch) | |
tree | 0326eefc642da6658e9e6642843c8dd84737bc88 | |
parent | 41e6e0f7e6bd373768eb34dc2d651e18c645f063 (diff) |
Use the "if (file_gets(...) == NULL) { fail }" style, as used elsewhere.
svn path=/trunk/; revision=46822
-rw-r--r-- | wiretap/netscreen.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/wiretap/netscreen.c b/wiretap/netscreen.c index de878dd64b..d6f4b6318f 100644 --- a/wiretap/netscreen.c +++ b/wiretap/netscreen.c @@ -154,23 +154,22 @@ static gboolean netscreen_check_file_type(wtap *wth, int *err, gchar **err_info) buf[NETSCREEN_LINE_LENGTH-1] = '\0'; for (line = 0; line < NETSCREEN_HEADER_LINES_TO_CHECK; line++) { - if (file_gets(buf, NETSCREEN_LINE_LENGTH, wth->fh) != NULL) { - - reclen = (guint) strlen(buf); - if (reclen < strlen(NETSCREEN_HDR_MAGIC_STR1) || - reclen < strlen(NETSCREEN_HDR_MAGIC_STR2)) { - continue; - } - - if (strstr(buf, NETSCREEN_HDR_MAGIC_STR1) || - strstr(buf, NETSCREEN_HDR_MAGIC_STR2)) { - return TRUE; - } - } else { + if (file_gets(buf, NETSCREEN_LINE_LENGTH, wth->fh) == NULL) { /* EOF or error. */ *err = file_error(wth->fh, err_info); return FALSE; } + + reclen = (guint) strlen(buf); + if (reclen < strlen(NETSCREEN_HDR_MAGIC_STR1) || + reclen < strlen(NETSCREEN_HDR_MAGIC_STR2)) { + continue; + } + + if (strstr(buf, NETSCREEN_HDR_MAGIC_STR1) || + strstr(buf, NETSCREEN_HDR_MAGIC_STR2)) { + return TRUE; + } } *err = 0; return FALSE; |