merge with gcc

[deliverable/binutils-gdb.git] / bfd / vms-misc.c

diff --git a/bfd/vms-misc.c b/bfd/vms-misc.c
index 94678da97b345b01bae3e4b04cdc6906d0d79f78..c5893f30a98233fe95fbe6dc3b6a5dd59db72ab7 100644 (file)
--- a/bfd/vms-misc.c
+++ b/bfd/vms-misc.c
@@ -220,7 +220,7 @@ _bfd_vms_hash_newfunc (entry, table, string)
 
 void
 _bfd_vms_get_header_values (abfd, buf, type, length)
-     bfd *abfd;
+     bfd *abfd ATTRIBUTE_UNUSED;
      unsigned char *buf;
      int *type;
      int *length;
@@ -344,7 +344,8 @@ _bfd_vms_get_record (abfd)
   /* read the record header on Alpha.  */
 
   if ((test_len != 0)
-      && (bfd_read (PRIV(vms_buf), 1, test_len, abfd) != test_len))
+      && (bfd_read (PRIV(vms_buf), 1, test_len, abfd)
+         != (bfd_size_type) test_len))
     {
       bfd_set_error (bfd_error_file_truncated);
       return 0;
@@ -419,7 +420,8 @@ _bfd_vms_get_record (abfd)
 #if VMS_DEBUG
       vms_debug (10, "bfd_read remaining %d\n", remaining);
 #endif
-      if (bfd_read (vms_buf + test_len, 1, remaining, abfd) != remaining)
+      if (bfd_read (vms_buf + test_len, 1, remaining, abfd) !=
+         (bfd_size_type) remaining)
        {
          bfd_set_error (bfd_error_file_truncated);
          return 0;
@@ -457,6 +459,9 @@ _bfd_vms_next_record (abfd)
        return -1;
     }
 
+  if (!PRIV(vms_rec))
+    return -1;
+
   if (PRIV(is_vax))
     {
       PRIV(rec_type) = *(PRIV(vms_rec));