diff options
author | Guy Harris <guy@alum.mit.edu> | 2014-10-09 16:44:15 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2014-10-09 23:45:30 +0000 |
commit | 45e462985db891248ffcb9db21e6b66733de0b84 (patch) | |
tree | 90d031f9769c07abaea83330a58dd9d3933eb7b1 /wiretap/netscreen.c | |
parent | 112c90a04b778958985b02b9663743cea1039f47 (diff) |
Use an enum for the open-routine return value, as per Evan Huus's suggestion.
Clean up some things we ran across while making those changes.
Change-Id: Ic0d8943d36e6e120d7af0a6148fad98015d1e83e
Reviewed-on: https://code.wireshark.org/review/4581
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/netscreen.c')
-rw-r--r-- | wiretap/netscreen.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/wiretap/netscreen.c b/wiretap/netscreen.c index 61b32834ee..b34312fd84 100644 --- a/wiretap/netscreen.c +++ b/wiretap/netscreen.c @@ -166,18 +166,18 @@ static gboolean netscreen_check_file_type(wtap *wth, int *err, gchar **err_info) } -int netscreen_open(wtap *wth, int *err, gchar **err_info) +wtap_open_return_val netscreen_open(wtap *wth, int *err, gchar **err_info) { /* Look for a NetScreen snoop header line */ if (!netscreen_check_file_type(wth, err, err_info)) { if (*err != 0 && *err != WTAP_ERR_SHORT_READ) - return -1; - return 0; + return WTAP_OPEN_ERROR; + return WTAP_OPEN_NOT_MINE; } if (file_seek(wth->fh, 0L, SEEK_SET, err) == -1) /* rewind */ - return -1; + return WTAP_OPEN_ERROR; wth->file_encap = WTAP_ENCAP_UNKNOWN; wth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_NETSCREEN; @@ -186,7 +186,7 @@ int netscreen_open(wtap *wth, int *err, gchar **err_info) wth->subtype_seek_read = netscreen_seek_read; wth->file_tsprec = WTAP_TSPREC_DSEC; - return 1; + return WTAP_OPEN_MINE; } /* Find the next packet and parse it; called from wtap_read(). */ |