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/eyesdn.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/eyesdn.c')
-rw-r--r-- | wiretap/eyesdn.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/wiretap/eyesdn.c b/wiretap/eyesdn.c index 2c815d62f1..4350d23644 100644 --- a/wiretap/eyesdn.c +++ b/wiretap/eyesdn.c @@ -135,18 +135,18 @@ static gint64 eyesdn_seek_next_packet(wtap *wth, int *err, gchar **err_info) return -1; } -int eyesdn_open(wtap *wth, int *err, gchar **err_info) +wtap_open_return_val eyesdn_open(wtap *wth, int *err, gchar **err_info) { char magic[EYESDN_HDR_MAGIC_SIZE]; /* Look for eyesdn header */ if (!wtap_read_bytes(wth->fh, &magic, sizeof magic, err, err_info)) { if (*err != WTAP_ERR_SHORT_READ) - return -1; - return 0; + return WTAP_OPEN_ERROR; + return WTAP_OPEN_NOT_MINE; } if (memcmp(magic, eyesdn_hdr_magic, EYESDN_HDR_MAGIC_SIZE) != 0) - return 0; + return WTAP_OPEN_NOT_MINE; wth->file_encap = WTAP_ENCAP_PER_PACKET; wth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_EYESDN; @@ -155,7 +155,7 @@ int eyesdn_open(wtap *wth, int *err, gchar **err_info) wth->subtype_seek_read = eyesdn_seek_read; wth->file_tsprec = WTAP_TSPREC_USEC; - return 1; + return WTAP_OPEN_MINE; } /* Find the next packet and parse it; called from wtap_read(). */ |