diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-10-09 18:14:12 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-10-10 01:14:37 +0000 |
| commit | 4f4e01b36bbe60b4ac1e486c8f6891cb6a07a24b (patch) | |
| tree | bc2f8ca096dc74c198bc38e55dbb113ce20bacc0 /wiretap | |
| parent | 9754192f9b4cdd5d2bf9e89c8f05a8986cd75e21 (diff) | |
| download | wireshark-4f4e01b36bbe60b4ac1e486c8f6891cb6a07a24b.tar.gz | |
Don't treat int return values as valid wtap_open_return_val values.
They happen to be, at least now, but that's not valid in C++, and it's
probably unwise in any case.
Change-Id: Ifd49920cfaa376e5e7788329ee83db3956a7cdff
Reviewed-on: https://code.wireshark.org/review/4585
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/peektagged.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/wiretap/peektagged.c b/wiretap/peektagged.c index b6e8c4e076..c09fc1830b 100644 --- a/wiretap/peektagged.c +++ b/wiretap/peektagged.c @@ -247,16 +247,18 @@ wtap_open_return_val peektagged_open(wtap *wth, int *err, gchar **err_info) * tags are properly opened and closed). */ ret = wtap_file_read_pattern (wth, "<FileVersion>", err, err_info); - if (ret != 1) { - /* 0 means EOF, which means "not a valid Peek tagged file"; - -1 means error, and "err" has been set. */ - return ret; + if (ret == -1) + return WTAP_OPEN_ERROR; + if (ret == 0) { + /* 0 means EOF, which means "not a valid Peek tagged file" */ + return WTAP_OPEN_NOT_MINE; } ret = wtap_file_read_number (wth, &fileVersion, err, err_info); - if (ret != 1) { - /* 0 means EOF, which means "not a valid Peek tagged file"; - -1 means error, and "err" has been set. */ - return ret; + if (ret == -1) + return WTAP_OPEN_ERROR; + if (ret == 0) { + /* 0 means EOF, which means "not a valid Peek tagged file" */ + return WTAP_OPEN_NOT_MINE; } /* If we got this far, we assume it's a Peek tagged file. */ |