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

1 files changed, 7 insertions, 7 deletions

diff --git a/wiretap/network_instruments.c b/wiretap/network_instruments.c
index d706e222f4..97ae73ef45 100644
--- a/wiretap/network_instruments.c
+++ b/wiretap/network_instruments.c
@@ -174,7 +174,7 @@ int network_instruments_open(wtap *wth, int *err, gchar **err_info)
         TLV_HEADER_FROM_LE_IN_PLACE(tlvh);
 
         if (tlvh.length < sizeof tlvh) {
-            *err = WTAP_ERR_BAD_RECORD;
+            *err = WTAP_ERR_BAD_FILE;
             *err_info = g_strdup_printf("Observer: bad record (TLV length %u < %lu)",
                 tlvh.length, (unsigned long)sizeof tlvh);
             return -1;
@@ -205,7 +205,7 @@ int network_instruments_open(wtap *wth, int *err, gchar **err_info)
 
     /* get to the first packet */
     if (header_offset < offset) {
-        *err = WTAP_ERR_BAD_RECORD;
+        *err = WTAP_ERR_BAD_FILE;
         *err_info = g_strdup_printf("Observer: bad record (offset to first packet %d < %d)",
             header_offset, offset);
         return FALSE;
@@ -296,7 +296,7 @@ static gboolean observer_read(wtap *wth, int *err, gchar **err_info,
 
     /* neglect frame markers for wiretap */
     if (packet_header.network_size < 4) {
-        *err = WTAP_ERR_BAD_RECORD;
+        *err = WTAP_ERR_BAD_FILE;
         *err_info = g_strdup_printf("Observer: bad record: Packet length %u < 4",
             packet_header.network_size);
         return FALSE;
@@ -445,7 +445,7 @@ read_packet_header(FILE_T fh, packet_entry_header *packet_header, int *err,
             return 0;    /* EOF */
         }
 
-        *err = WTAP_ERR_BAD_RECORD;
+        *err = WTAP_ERR_BAD_FILE;
         *err_info = g_strdup_printf("Observer: bad record: Invalid magic number 0x%08x",
             packet_header->packet_magic);
         return -1;
@@ -465,7 +465,7 @@ read_packet_header(FILE_T fh, packet_entry_header *packet_header, int *err,
         TLV_HEADER_FROM_LE_IN_PLACE(tlvh);
 
         if (tlvh.length < sizeof tlvh) {
-            *err = WTAP_ERR_BAD_RECORD;
+            *err = WTAP_ERR_BAD_FILE;
             *err_info = g_strdup_printf("Observer: bad record (TLV length %u < %lu)",
                 tlvh.length, (unsigned long)sizeof tlvh);
             return -1;
@@ -492,7 +492,7 @@ read_packet_data(FILE_T fh, int offset_to_frame, int current_offset_from_packet_
 
     /* validate offsets */
     if (offset_to_frame < current_offset_from_packet_header) {
-        *err = WTAP_ERR_BAD_RECORD;
+        *err = WTAP_ERR_BAD_FILE;
         *err_info = g_strdup_printf("Observer: bad record (offset to packet data %d < %d)",
             offset_to_frame, current_offset_from_packet_header);
         return -1;
@@ -522,7 +522,7 @@ skip_to_next_packet(wtap *wth, int offset_to_next_packet, int current_offset_fro
 
     /* validate offsets */
     if (offset_to_next_packet < current_offset_from_packet_header) {
-        *err = WTAP_ERR_BAD_RECORD;
+        *err = WTAP_ERR_BAD_FILE;
         *err_info = g_strdup_printf("Observer: bad record (offset to next packet %d < %d)",
             offset_to_next_packet, current_offset_from_packet_header);
         return FALSE;