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/pppdump.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/pppdump.c')
| -rw-r--r-- | wiretap/pppdump.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wiretap/pppdump.c b/wiretap/pppdump.c index c483b8a1d8..46465bca7a 100644 --- a/wiretap/pppdump.c +++ b/wiretap/pppdump.c @@ -680,7 +680,7 @@ collate(pppdump_t* state, FILE_T fh, int *err, gchar **err_info, guint8 *pd, default: /* XXX - bad file */ - *err = WTAP_ERR_BAD_RECORD; + *err = WTAP_ERR_BAD_FILE; *err_info = g_strdup_printf("pppdump: bad ID byte 0x%02x", id); return FALSE; } @@ -724,7 +724,7 @@ pppdump_seek_read(wtap *wth, pid = g_ptr_array_index(state->pids, seek_off); if (!pid) { - *err = WTAP_ERR_BAD_RECORD; /* XXX - better error? */ + *err = WTAP_ERR_BAD_FILE; /* XXX - better error? */ *err_info = g_strdup("pppdump: PID not found for record"); return FALSE; } @@ -755,7 +755,7 @@ pppdump_seek_read(wtap *wth, } while (direction != pid->dir); if (len != num_bytes) { - *err = WTAP_ERR_BAD_RECORD; /* XXX - better error? */ + *err = WTAP_ERR_BAD_FILE; /* XXX - better error? */ *err_info = g_strdup_printf("pppdump: requested length %d doesn't match record length %d", len, num_bytes); return FALSE; |