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/5views.c | |
| parent | 112c90a04b778958985b02b9663743cea1039f47 (diff) | |
| download | wireshark-45e462985db891248ffcb9db21e6b66733de0b84.tar.gz | |
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/5views.c')
| -rw-r--r-- | wiretap/5views.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/wiretap/5views.c b/wiretap/5views.c index 6e128d4f0e..114e1562fc 100644 --- a/wiretap/5views.c +++ b/wiretap/5views.c @@ -110,7 +110,8 @@ static gboolean _5views_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr, c static gboolean _5views_dump_close(wtap_dumper *wdh, int *err); -int _5views_open(wtap *wth, int *err, gchar **err_info) +wtap_open_return_val +_5views_open(wtap *wth, int *err, gchar **err_info) { t_5VW_Capture_Header Capture_Header; int encap = WTAP_ENCAP_UNKNOWN; @@ -118,14 +119,14 @@ int _5views_open(wtap *wth, int *err, gchar **err_info) if (!wtap_read_bytes(wth->fh, &Capture_Header.Info_Header, sizeof(t_5VW_Info_Header), err, err_info)) { if (*err != WTAP_ERR_SHORT_READ) - return -1; - return 0; + return WTAP_OPEN_ERROR; + return WTAP_OPEN_NOT_MINE; } /* Check whether that's 5Views format or not */ if(Capture_Header.Info_Header.Signature != CST_5VW_INFO_HEADER_KEY) { - return 0; + return WTAP_OPEN_NOT_MINE; } /* Check Version */ @@ -139,7 +140,7 @@ int _5views_open(wtap *wth, int *err, gchar **err_info) default: *err = WTAP_ERR_UNSUPPORTED; *err_info = g_strdup_printf("5views: header version %u unsupported", Capture_Header.Info_Header.Version); - return -1; + return WTAP_OPEN_ERROR; } /* Check File Type */ @@ -149,7 +150,7 @@ int _5views_open(wtap *wth, int *err, gchar **err_info) { *err = WTAP_ERR_UNSUPPORTED; *err_info = g_strdup_printf("5views: file is not a capture file (filetype is %u)", Capture_Header.Info_Header.Version); - return -1; + return WTAP_OPEN_ERROR; } /* Check possible Encap */ @@ -164,13 +165,13 @@ int _5views_open(wtap *wth, int *err, gchar **err_info) *err = WTAP_ERR_UNSUPPORTED_ENCAP; *err_info = g_strdup_printf("5views: network type %u unknown or unsupported", Capture_Header.Info_Header.FileType); - return -1; + return WTAP_OPEN_ERROR; } /* read the remaining header information */ if (!wtap_read_bytes(wth->fh, &Capture_Header.HeaderDateCreation, sizeof (t_5VW_Capture_Header) - sizeof(t_5VW_Info_Header), err, err_info)) - return -1; + return WTAP_OPEN_ERROR; /* This is a 5views capture file */ wth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_5VIEWS; @@ -180,7 +181,7 @@ int _5views_open(wtap *wth, int *err, gchar **err_info) wth->snapshot_length = 0; /* not available in header */ wth->file_tsprec = WTAP_TSPREC_NSEC; - return 1; + return WTAP_OPEN_MINE; } /* Read the next packet */ |