diff options
| author | Guy Harris <guy@alum.mit.edu> | 2011-12-13 09:53:50 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2011-12-13 09:53:50 +0000 |
| commit | d94bd07f99438278cb11f24b00571ab2907b6bdb (patch) | |
| tree | 5f96d0a35c97af466bcb2d5b8a9371327bb0190f /wiretap/ascendtext.c | |
| parent | 1df4ee91090e35c25835204d7175b9395be32606 (diff) | |
| download | wireshark-d94bd07f99438278cb11f24b00571ab2907b6bdb.tar.gz | |
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/ascendtext.c')
| -rw-r--r-- | wiretap/ascendtext.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/ascendtext.c b/wiretap/ascendtext.c index dd8e750dd8..612a202b09 100644 --- a/wiretap/ascendtext.c +++ b/wiretap/ascendtext.c @@ -289,7 +289,7 @@ static gboolean ascend_read(wtap *wth, int *err, gchar **err_info, return FALSE; if (parse_ascend(wth->fh, buf, &wth->pseudo_header.ascend, &header, &(ascend->next_packet_seek_start)) != PARSED_RECORD) { - *err = WTAP_ERR_BAD_RECORD; + *err = WTAP_ERR_BAD_FILE; *err_info = g_strdup((ascend_parse_error != NULL) ? ascend_parse_error : "parse error"); return FALSE; } @@ -337,7 +337,7 @@ static gboolean ascend_seek_read(wtap *wth, gint64 seek_off, return FALSE; if (parse_ascend(wth->random_fh, pd, &pseudo_head->ascend, NULL, &(ascend->next_packet_seek_start)) != PARSED_RECORD) { - *err = WTAP_ERR_BAD_RECORD; + *err = WTAP_ERR_BAD_FILE; *err_info = g_strdup((ascend_parse_error != NULL) ? ascend_parse_error : "parse error"); return FALSE; } |