2002-08-09 Michael Snyder <msnyder@redhat.com>

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

diff --git a/bfd/vms-hdr.c b/bfd/vms-hdr.c
index e4ee546dd0e754fdaac2910363bb64e29deddbb6..fa8af97305503b679a37e8488e1312555311153a 100644 (file)
--- a/bfd/vms-hdr.c
+++ b/bfd/vms-hdr.c
@@ -1,6 +1,6 @@
 /* vms-hdr.c -- BFD back-end for VMS/VAX (openVMS/VAX) and
    EVAX (openVMS/Alpha) files.
-   Copyright 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
    HDR record handling functions
    EMH record handling functions
@@ -24,17 +24,22 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#include <ctype.h>
-
 #include "bfd.h"
 #include "sysdep.h"
 #include "bfdlink.h"
+#include "safe-ctype.h"
 #include "libbfd.h"
 
 #include "vms.h"
 
-/*---------------------------------------------------------------------------*/
+#ifdef HAVE_ALLOCA_H
+#include <alloca.h>
+#endif
 
+static unsigned char *get_vms_time_string PARAMS ((void));
+
+
+/*---------------------------------------------------------------------------*/
 
 /* Read & process emh record
    return 0 on success, -1 on error  */
@@ -196,11 +201,9 @@ _bfd_vms_slurp_hdr (abfd, objtype)
   return 0;
 }
 
-
 /*-----------------------------------------------------------------------------*/
 /* Output routines.  */
 
-
 /* Manufacure a VMS like time on a unix based system.
    stolen from obj-vms.c  */
 
@@ -240,7 +243,6 @@ get_vms_time_string ()
   return tbuf;
 }
 
-
 /* write object header for bfd abfd  */
 
 int
@@ -249,11 +251,10 @@ _bfd_vms_write_hdr (abfd, objtype)
      int objtype;
 {
   asymbol *symbol;
-  int symnum;
+  unsigned int symnum;
   int had_case = 0;
   int had_file = 0;
 
-
 #if VMS_DEBUG
   vms_debug (2, "vms_write_hdr (%p)\n", abfd);
 #endif
@@ -301,8 +302,7 @@ _bfd_vms_write_hdr (abfd, objtype)
       fptr = fout;
       while (*fptr != 0)
        {
-         if (islower (*fptr))
-           *fptr = toupper (*fptr);
+         *fptr = TOUPPER (*fptr);
          fptr++;
          if ((*fptr == ';')
             || ((fptr - fout) > 31))
@@ -313,7 +313,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);
@@ -345,7 +345,8 @@ _bfd_vms_write_hdr (abfd, objtype)
              continue;
            }
 
-         _bfd_vms_output_dump (abfd, (unsigned char *)symbol->name, strlen (symbol->name));
+         _bfd_vms_output_dump (abfd, (unsigned char *) symbol->name,
+                               (int) strlen (symbol->name));
          if (had_case)
            break;
          had_file = 1;
@@ -392,7 +393,7 @@ _bfd_vms_slurp_eom (abfd, objtype)
 
   vms_rec = PRIV(vms_rec);
 
-  if ((objtype == OBJ_S_C_EOM) 
+  if ((objtype == OBJ_S_C_EOM)
      || (objtype == OBJ_S_C_EOMW))
     {
     }
@@ -420,7 +421,6 @@ _bfd_vms_slurp_eom (abfd, objtype)
   return 0;
 }
 
-
 /* Write eom record for bfd abfd  */
 
 int
@@ -433,7 +433,7 @@ _bfd_vms_write_eom (abfd, objtype)
 #endif
 
   _bfd_vms_output_begin (abfd, objtype, -1);
-  _bfd_vms_output_long (abfd, (unsigned long)(PRIV(vms_linkage_index) >> 1));
+  _bfd_vms_output_long (abfd, (unsigned long) (PRIV(vms_linkage_index) >> 1));
   _bfd_vms_output_byte (abfd, 0);      /* completion code */
   _bfd_vms_output_byte (abfd, 0);      /* fill byte */
 
@@ -448,7 +448,7 @@ _bfd_vms_write_eom (abfd, objtype)
          return -1;
        }
       _bfd_vms_output_short (abfd, 0);
-      _bfd_vms_output_long (abfd, (unsigned long)(section->index));
+      _bfd_vms_output_long (abfd, (unsigned long) (section->index));
       _bfd_vms_output_long (abfd,
                             (unsigned long) bfd_get_start_address (abfd));
       _bfd_vms_output_long (abfd, 0);