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/toshiba.c | |
| parent | 1df4ee91090e35c25835204d7175b9395be32606 (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/toshiba.c')
| -rw-r--r-- | wiretap/toshiba.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/wiretap/toshiba.c b/wiretap/toshiba.c index 2072ccddc2..921bd988aa 100644 --- a/wiretap/toshiba.c +++ b/wiretap/toshiba.c @@ -280,7 +280,7 @@ toshiba_seek_read (wtap *wth, gint64 seek_off, if (pkt_len != len) { if (pkt_len != -1) { - *err = WTAP_ERR_BAD_RECORD; + *err = WTAP_ERR_BAD_FILE; *err_info = g_strdup_printf("toshiba: requested length %d doesn't match record length %d", len, pkt_len); } @@ -319,7 +319,7 @@ parse_toshiba_rec_hdr(wtap *wth, FILE_T fh, &pktnum, &hr, &min, &sec, &csec, channel, direction); if (num_items_scanned != 7) { - *err = WTAP_ERR_BAD_RECORD; + *err = WTAP_ERR_BAD_FILE; *err_info = g_strdup("toshiba: record header isn't valid"); return -1; } @@ -349,7 +349,7 @@ parse_toshiba_rec_hdr(wtap *wth, FILE_T fh, num_items_scanned = sscanf(line+64, "LEN=%9d", &pkt_len); if (num_items_scanned != 1) { - *err = WTAP_ERR_BAD_RECORD; + *err = WTAP_ERR_BAD_FILE; *err_info = g_strdup("toshiba: OFFSET line doesn't have valid LEN item"); return -1; } @@ -407,7 +407,7 @@ parse_toshiba_hex_dump(FILE_T fh, int pkt_len, guint8* buf, int *err, return FALSE; } if (!parse_single_hex_dump_line(line, buf, i * 16)) { - *err = WTAP_ERR_BAD_RECORD; + *err = WTAP_ERR_BAD_FILE; *err_info = g_strdup("toshiba: hex dump not valid"); return FALSE; } |