Convert to ISO C90 formatting

[binutils-gdb.git] / bfd / vms-hdr.c

diff --git a/bfd/vms-hdr.c b/bfd/vms-hdr.c
index fedfe75594ac570333113cc9bc451292082baecc..b8c8ee699ae787524ae04130c93e89d8292cb4c2 100644 (file)
--- a/bfd/vms-hdr.c
+++ b/bfd/vms-hdr.c
@@ -1,6 +1,7 @@
 /* vms-hdr.c -- BFD back-end for VMS/VAX (openVMS/VAX) and
    EVAX (openVMS/Alpha) files.
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005
+   Free Software Foundation, Inc.
 
    HDR record handling functions
    EMH record handling functions
@@ -25,6 +26,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "bfd.h"
+#include "bfdver.h"
 #include "sysdep.h"
 #include "bfdlink.h"
 #include "safe-ctype.h"
@@ -204,7 +206,7 @@ _bfd_vms_slurp_hdr (abfd, objtype)
 /*-----------------------------------------------------------------------------*/
 /* Output routines.  */
 
-/* Manufacure a VMS like time on a unix based system.
+/* Manufacture a VMS like time on a unix based system.
    stolen from obj-vms.c  */
 
 static unsigned char *
@@ -223,7 +225,8 @@ get_vms_time_string ()
   pnt[10] = 0;
   pnt[16] = 0;
   pnt[24] = 0;
-  sprintf (tbuf, "%2s-%3s-%s %s", pnt + 8, pnt + 4, pnt + 20, pnt + 11);
+  sprintf ((char *) tbuf, "%2s-%3s-%s %s",
+          pnt + 8, pnt + 4, pnt + 20, pnt + 11);
 #else
 #include <starlet.h>
   struct
@@ -313,7 +316,7 @@ _bfd_vms_write_hdr (abfd, objtype)
   else
     _bfd_vms_output_counted (abfd, "NONAME");
 
-  _bfd_vms_output_counted (abfd, BFD_VERSION);
+  _bfd_vms_output_counted (abfd, BFD_VERSION_STRING);
   _bfd_vms_output_dump (abfd, get_vms_time_string (), 17);
   _bfd_vms_output_fill (abfd, 0, 17);
   _bfd_vms_output_flush (abfd);
@@ -407,10 +410,10 @@ _bfd_vms_slurp_eom (abfd, objtype)
          bfd_set_error (bfd_error_bad_value);
          return -1;
        }
-      PRIV(eom_data).eom_has_transfer = false;
+      PRIV(eom_data).eom_has_transfer = FALSE;
       if (PRIV(rec_size) > 10)
        {
-          PRIV(eom_data).eom_has_transfer = true;
+          PRIV(eom_data).eom_has_transfer = TRUE;
           PRIV(eom_data).eom_b_tfrflg = *(vms_rec + 9);
           PRIV(eom_data).eom_l_psindx = bfd_getl32 (vms_rec + 12);
           PRIV(eom_data).eom_l_tfradr = bfd_getl32 (vms_rec + 16);