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/dct3trace.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/dct3trace.c')
| -rw-r--r-- | wiretap/dct3trace.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/wiretap/dct3trace.c b/wiretap/dct3trace.c index 7ce51242ac..873d96485b 100644 --- a/wiretap/dct3trace.c +++ b/wiretap/dct3trace.c @@ -155,7 +155,7 @@ xml_get_int(int *val, const char *str, const char *pattern) } -int dct3trace_open(wtap *wth, int *err, gchar **err_info) +wtap_open_return_val dct3trace_open(wtap *wth, int *err, gchar **err_info) { char line1[64], line2[64]; @@ -165,15 +165,15 @@ int dct3trace_open(wtap *wth, int *err, gchar **err_info) { *err = file_error(wth->fh, err_info); if (*err != 0 && *err != WTAP_ERR_SHORT_READ) - return -1; - return 0; + return WTAP_OPEN_ERROR; + return WTAP_OPEN_NOT_MINE; } /* Don't compare line endings */ if( strncmp(dct3trace_magic_line1, line1, strlen(dct3trace_magic_line1)) != 0 || strncmp(dct3trace_magic_line2, line2, strlen(dct3trace_magic_line2)) != 0) { - return 0; + return WTAP_OPEN_NOT_MINE; } wth->file_encap = WTAP_ENCAP_GSM_UM; @@ -183,7 +183,7 @@ int dct3trace_open(wtap *wth, int *err, gchar **err_info) wth->subtype_seek_read = dct3trace_seek_read; wth->file_tsprec = WTAP_TSPREC_SEC; - return 1; + return WTAP_OPEN_MINE; } |