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/dct3trace.c | |
| parent | 1df4ee91090e35c25835204d7175b9395be32606 (diff) | |
| download | wireshark-d94bd07f99438278cb11f24b00571ab2907b6bdb.tar.gz wireshark-d94bd07f99438278cb11f24b00571ab2907b6bdb.tar.bz2 wireshark-d94bd07f99438278cb11f24b00571ab2907b6bdb.zip | |
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/dct3trace.c')
| -rw-r--r-- | wiretap/dct3trace.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/wiretap/dct3trace.c b/wiretap/dct3trace.c index 77611543e2..12910bebac 100644 --- a/wiretap/dct3trace.c +++ b/wiretap/dct3trace.c @@ -240,7 +240,7 @@ static gboolean dct3trace_get_packet(FILE_T fh, union wtap_pseudo_header *pseudo else { /* If not got any data return error */ - *err = WTAP_ERR_BAD_RECORD; + *err = WTAP_ERR_BAD_FILE; *err_info = g_strdup_printf("dct3trace: record without data"); return FALSE; } @@ -271,7 +271,7 @@ static gboolean dct3trace_get_packet(FILE_T fh, union wtap_pseudo_header *pseudo if( ret != 0 ) { - *err = WTAP_ERR_BAD_RECORD; + *err = WTAP_ERR_BAD_FILE; *err_info = g_strdup_printf("dct3trace: record missing mandatory attributes"); return FALSE; } @@ -387,7 +387,7 @@ static gboolean dct3trace_seek_read (wtap *wth, gint64 seek_off, if( len != buf_len && len != -1 ) { - *err = WTAP_ERR_BAD_RECORD; + *err = WTAP_ERR_BAD_FILE; *err_info = g_strdup_printf("dct3trace: requested length %d doesn't match record length %d", len, buf_len); return FALSE; @@ -395,7 +395,7 @@ static gboolean dct3trace_seek_read (wtap *wth, gint64 seek_off, if( buf_len > MAX_PACKET_LEN) { - *err = WTAP_ERR_BAD_RECORD; + *err = WTAP_ERR_BAD_FILE; *err_info = g_strdup_printf("dct3trace: record length %d too long", buf_len); return FALSE; } |