PR22374 testcase, function pointer references in .data

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

diff --git a/bfd/vms-lib.c b/bfd/vms-lib.c
index a02da0c66810b453d2e4d552dfc5e65e3b82f408..27f07e13a9ba7e87066d05e4a7dcd2342f8cb060 100644 (file)
--- a/bfd/vms-lib.c
+++ b/bfd/vms-lib.c
@@ -1662,7 +1662,7 @@ vms_write_index (bfd *abfd,
                       /* Write it to the disk (if there is one).  */
                       if (kbn_vbn != 0)
                         {
-                          if (vms_write_block (abfd, kbn_vbn, kbn_blk) != TRUE)
+                          if (!vms_write_block (abfd, kbn_vbn, kbn_blk))
                             return FALSE;
                         }
                       else
@@ -1780,7 +1780,7 @@ vms_write_index (bfd *abfd,
               if (abfd != NULL)
                 {
                   bfd_putl16 (blk[j].len + blk[j].lastlen, rblk[j]->used);
-                  if (vms_write_block (abfd, blk[j].vbn, rblk[j]) != TRUE)
+                  if (!vms_write_block (abfd, blk[j].vbn, rblk[j]))
                     return FALSE;
                 }
 
@@ -1873,7 +1873,7 @@ vms_write_index (bfd *abfd,
     {
       /* Write this block on the disk.  */
       bfd_putl16 (blk[j].len + blk[j].lastlen, rblk[j]->used);
-      if (vms_write_block (abfd, blk[j].vbn, rblk[j]) != TRUE)
+      if (!vms_write_block (abfd, blk[j].vbn, rblk[j]))
         return FALSE;
 
       free (rblk[j]);
@@ -1882,7 +1882,7 @@ vms_write_index (bfd *abfd,
   /* Write the last kbn (if any).  */
   if (kbn_vbn != 0)
     {
-      if (vms_write_block (abfd, kbn_vbn, kbn_blk) != TRUE)
+      if (!vms_write_block (abfd, kbn_vbn, kbn_blk))
         return FALSE;
       free (kbn_blk);
     }
@@ -2223,11 +2223,11 @@ _bfd_vms_lib_write_archive_contents (bfd *arch)
 
   /* Write the indexes.  */
   vbn = 2;
-  if (vms_write_index (arch, modules, nbr_modules, &vbn, &mod_idx_vbn,
-                       is_elfidx) != TRUE)
+  if (!vms_write_index (arch, modules, nbr_modules, &vbn, &mod_idx_vbn,
+                       is_elfidx))
     return FALSE;
-  if (vms_write_index (arch, symbols, nbr_symbols, &vbn, &sym_idx_vbn,
-                       is_elfidx) != TRUE)
+  if (!vms_write_index (arch, symbols, nbr_symbols, &vbn, &sym_idx_vbn,
+                       is_elfidx))
     return FALSE;
 
   /* Write libary header.  */
@@ -2298,14 +2298,14 @@ _bfd_vms_lib_write_archive_contents (bfd *arch)
     bfd_putl16 (sym_idx_vbn, idd->vbn);
     idd++;
 
-    if (vms_write_block (arch, 1, blk) != TRUE)
+    if (!vms_write_block (arch, 1, blk))
       return FALSE;
   }
 
   return TRUE;
 
  input_err:
-  bfd_set_error (bfd_error_on_input, current, bfd_get_error ());
+  bfd_set_input_error (current, bfd_get_error ());
   return FALSE;
 }