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/visual.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/visual.c')
-rw-r--r-- | wiretap/visual.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/wiretap/visual.c b/wiretap/visual.c index d781e3651a..c29216d94d 100644 --- a/wiretap/visual.c +++ b/wiretap/visual.c @@ -171,7 +171,7 @@ static void visual_dump_free(wtap_dumper *wdh); /* Open a file for reading */ -int visual_open(wtap *wth, int *err, gchar **err_info) +wtap_open_return_val visual_open(wtap *wth, int *err, gchar **err_info) { char magic[sizeof visual_magic]; struct visual_file_hdr vfile_hdr; @@ -182,18 +182,18 @@ int visual_open(wtap *wth, int *err, gchar **err_info) 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, visual_magic, sizeof visual_magic) != 0) { - return 0; + return WTAP_OPEN_NOT_MINE; } /* Read the rest of the file header. */ if (!wtap_read_bytes(wth->fh, &vfile_hdr, sizeof vfile_hdr, err, err_info)) { - return -1; + return WTAP_OPEN_ERROR; } /* Verify the file version is known */ @@ -202,7 +202,7 @@ int visual_open(wtap *wth, int *err, gchar **err_info) { *err = WTAP_ERR_UNSUPPORTED; *err_info = g_strdup_printf("visual: file version %u unsupported", vfile_hdr.file_version); - return -1; + return WTAP_OPEN_ERROR; } /* Translate the encapsulation type; these values are SNMP ifType @@ -244,7 +244,7 @@ int visual_open(wtap *wth, int *err, gchar **err_info) *err = WTAP_ERR_UNSUPPORTED_ENCAP; *err_info = g_strdup_printf("visual: network type %u unknown or unsupported", vfile_hdr.media_type); - return -1; + return WTAP_OPEN_ERROR; } /* Fill in the wiretap struct with data from the file header */ @@ -264,7 +264,7 @@ int visual_open(wtap *wth, int *err, gchar **err_info) visual->start_time = ((double) pletoh32(&vfile_hdr.start_time)) * 1000000; visual->current_pkt = 1; - return 1; + return WTAP_OPEN_MINE; } |