aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/commview.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2011-12-13 09:53:50 +0000
committerGuy Harris <guy@alum.mit.edu>2011-12-13 09:53:50 +0000
commitd94bd07f99438278cb11f24b00571ab2907b6bdb (patch)
tree5f96d0a35c97af466bcb2d5b8a9371327bb0190f /wiretap/commview.c
parent1df4ee91090e35c25835204d7175b9395be32606 (diff)
Rename WTAP_ERR_BAD_RECORD to WTAP_ERR_BAD_FILE; it really reports any
form of corruption/bogosity in a file, including in a file header as well as in records in the file. Change the error message wtap_strerror() returns for it to reflect that. Use it for some file header problems for which it wasn't already being used - WTAP_ERR_UNSUPPORTED shouldn't be used for that, it should only be used for files that we have no reason to believe are invalid but that have a version number we don't know about or some other non-link-layer-encapsulation-type value we don't know about. svn path=/trunk/; revision=40175
Diffstat (limited to 'wiretap/commview.c')
-rw-r--r--wiretap/commview.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/commview.c b/wiretap/commview.c
index befa2399bf..31aa385646 100644
--- a/wiretap/commview.c
+++ b/wiretap/commview.c
@@ -184,7 +184,7 @@ commview_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset)
break;
default :
- *err = WTAP_ERR_BAD_RECORD;
+ *err = WTAP_ERR_BAD_FILE;
*err_info = g_strdup_printf("commview: unsupported encap: %u",
cv_hdr.flags & FLAGS_MEDIUM);
return FALSE;
@@ -240,7 +240,7 @@ commview_seek_read(wtap *wth, gint64 seek_off, union wtap_pseudo_header
}
if(length != cv_hdr.data_len) {
- *err = WTAP_ERR_BAD_RECORD;
+ *err = WTAP_ERR_BAD_FILE;
*err_info = g_strdup_printf("commview: record length %u doesn't match requested length %d", cv_hdr.data_len, length);
return FALSE;
}