Changeset 609 for branches/GNU/src/binutils/bfd/vms-misc.c

Timestamp:

Aug 16, 2003, 6:59:22 PM (22 years ago)

Author:

bird

Message:

binutils v2.14 - offical sources.

File:

• branches/GNU/src/binutils/bfd/vms-misc.c (modified) (29 diffs, 1 prop)

branches/GNU/src/binutils/bfd/vms-misc.c

@@ -1 +1 @@
 /* vms-misc.c -- Miscellaneous functions for VAX (openVMS/VAX) and
    EVAX (openVMS/Alpha) files.
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
    Free Software Foundation, Inc.
 
@@ -30 +30 @@
 
 #include "vms.h"
+
+static vms_section *add_new_contents PARAMS ((bfd *, sec_ptr));
+static int hash_string PARAMS ((const char *));
+static asymbol *new_symbol PARAMS ((bfd *, char *));
 
 /*-----------------------------------------------------------------------------*/
@@ -291 +295 @@
   if (PRIV (buf_size) == 0)
     {
+      bfd_size_type amt;
+
       if (PRIV (is_vax))
         {
-          PRIV (vms_buf) = (unsigned char *) malloc (OBJ_S_C_MAXRECSIZ);
-          PRIV (buf_size) = OBJ_S_C_MAXRECSIZ;
+          amt = OBJ_S_C_MAXRECSIZ;
           PRIV (file_format) = FF_VAX;
         }
       else
-        PRIV (vms_buf) = (unsigned char *) malloc (6);
+        amt = 6;
+      PRIV (vms_buf) = (unsigned char *) bfd_malloc (amt);
+      PRIV (buf_size) = amt;
     }
 
@@ -304 +311 @@
 
   if (vms_buf == 0)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return -1;
-    }
+    return -1;
 
   switch (PRIV (file_format))
@@ -333 +337 @@
   if (bfd_tell (abfd) & 1)
     {
-      if (bfd_read (PRIV (vms_buf), 1, 1, abfd) != 1)
+      if (bfd_bread (PRIV (vms_buf), (bfd_size_type) 1, abfd) != 1)
         {
           bfd_set_error (bfd_error_file_truncated);
@@ -343 +347 @@
 
   if ((test_len != 0)
-      && (bfd_read (PRIV (vms_buf), 1, test_len, abfd)
+      && (bfd_bread (PRIV (vms_buf), (bfd_size_type) test_len, abfd)
           != (bfd_size_type) test_len))
     {
@@ -354 +358 @@
   if (PRIV (file_format) == FF_UNKNOWN)
     {                                           /* record length repeats ? */
-      if ( (vms_buf[0] == vms_buf[4])
-        && (vms_buf[1] == vms_buf[5]))
+      if (vms_buf[0] == vms_buf[4]
+          && vms_buf[1] == vms_buf[5])
         {
           PRIV (file_format) = FF_FOREIGN;      /* Y: foreign environment */
@@ -369 +373 @@
   if (PRIV (is_vax))
     {
-      PRIV (rec_length) = bfd_read (vms_buf, 1, PRIV (buf_size), abfd);
+      PRIV (rec_length) = bfd_bread (vms_buf, (bfd_size_type) PRIV (buf_size),
+                                     abfd);
       if (PRIV (rec_length) <= 0)
         {
@@ -381 +386 @@
       /* extract vms record length  */
 
-      _bfd_vms_get_header_values (abfd, vms_buf+test_start, NULL,
+      _bfd_vms_get_header_values (abfd, vms_buf + test_start, NULL,
                                   &PRIV (rec_length));
 
@@ -402 +407 @@
       if (PRIV (rec_length) > PRIV (buf_size))
         {
-          PRIV (vms_buf) = (unsigned char *) realloc (vms_buf, PRIV (rec_length));
+          PRIV (vms_buf) = ((unsigned char *)
+                            bfd_realloc (vms_buf,
+                                         (bfd_size_type) PRIV (rec_length)));
           vms_buf = PRIV (vms_buf);
           if (vms_buf == 0)
-            {
-              bfd_set_error (bfd_error_no_memory);
-              return -1;
-            }
+            return -1;
           PRIV (buf_size) = PRIV (rec_length);
         }
@@ -417 +421 @@
 
 #if VMS_DEBUG
-      vms_debug (10, "bfd_read remaining %d\n", remaining);
-#endif
-      if (bfd_read (vms_buf + test_len, 1, remaining, abfd) !=
+      vms_debug (10, "bfd_bread remaining %d\n", remaining);
+#endif
+      if (bfd_bread (vms_buf + test_len, (bfd_size_type) remaining, abfd) !=
           (bfd_size_type) remaining)
         {
@@ -429 +433 @@
 
 #if VMS_DEBUG
-  vms_debug (11, "bfd_read rec_length %d\n", PRIV (rec_length));
+  vms_debug (11, "bfd_bread rec_length %d\n", PRIV (rec_length));
 #endif
 
@@ -491 +495 @@
      int size;
 {
-  char *newstr = bfd_malloc (size + 1);
+  char *newstr = bfd_malloc ((bfd_size_type) size + 1);
 
   if (newstr == NULL)
     return 0;
-  strncpy (newstr, (char *)str, size);
+  strncpy (newstr, (char *) str, (size_t) size);
   newstr[size] = 0;
 
@@ -593 +597 @@
     return sptr;
 
-  newptr = (vms_section *) bfd_malloc (sizeof (vms_section));
+  newptr = (vms_section *) bfd_alloc (abfd,
+                                      (bfd_size_type) sizeof (vms_section));
   if (newptr == (vms_section *) NULL)
     return NULL;
-  newptr->contents = (unsigned char *) bfd_alloc (abfd, (int)section->_raw_size);
-  if (newptr->contents == (unsigned char *)NULL)
+  newptr->contents = (unsigned char *) bfd_alloc (abfd, section->_raw_size);
+  if (newptr->contents == (unsigned char *) NULL)
     return NULL;
   newptr->offset = 0;
@@ -606 +611 @@
 }
 
-/* Save section data & offset to an vms_section structure
-   vms_section_table[] holds the vms_section chain  */
-
-boolean
+/* Save section data & offset to a vms_section structure
+   vms_section_table[] holds the vms_section chain.  */
+
+bfd_boolean
 _bfd_save_vms_section (abfd, section, data, offset, count)
      bfd *abfd;
@@ -622 +627 @@
     {
       bfd_set_error (bfd_error_nonrepresentable_section);
-      return false;
+      return FALSE;
     }
   if (count == (bfd_size_type)0)
-    return true;
+    return TRUE;
   sptr = add_new_contents (abfd, section);
   if (sptr == NULL)
-    return false;
+    return FALSE;
   memcpy (sptr->contents + offset, data, (size_t) count);
 
-  return true;
+  return TRUE;
 }
 
@@ -668 +673 @@
 #endif
 
-  _bfd_vms_output_short (abfd,rectype);
+  _bfd_vms_output_short (abfd, (unsigned int) rectype);
 
   /* save current output position to fill in lenght later  */
@@ -680 +685 @@
 #endif
 
-  _bfd_vms_output_short (abfd,0);               /* placeholder for length */
+  _bfd_vms_output_short (abfd, 0);              /* placeholder for length */
 
   if (rechead != -1)
-    _bfd_vms_output_short (abfd,rechead);
+    _bfd_vms_output_short (abfd, (unsigned int) rechead);
 
   return;
@@ -783 +788 @@
   /* put length to buffer  */
   PRIV (output_size) = PRIV (length_pos);
-  _bfd_vms_output_short (abfd, (unsigned int)length);
+  _bfd_vms_output_short (abfd, (unsigned int) length);
 
   if (PRIV (push_level) == 0)
@@ -789 +794 @@
 #ifndef VMS
         /* write length first, see FF_FOREIGN in the input routines */
-      fwrite (PRIV (output_buf)+2, 2, 1, (FILE *)abfd->iostream);
-#endif
-      fwrite (PRIV (output_buf), real_size, 1, (FILE *)abfd->iostream);
+      fwrite (PRIV (output_buf) + 2, 2, 1, (FILE *) abfd->iostream);
+#endif
+      fwrite (PRIV (output_buf), (size_t) real_size, 1,
+              (FILE *) abfd->iostream);
 
       PRIV (output_size) = 0;
@@ -862 +868 @@
 #endif
 
-  bfd_put_16 (abfd, value & 0xffff, PRIV (output_buf) + PRIV (output_size));
+  bfd_put_16 (abfd, (bfd_vma) value & 0xffff,
+              PRIV (output_buf) + PRIV (output_size));
   PRIV (output_size) += 2;
   return;
@@ -878 +885 @@
 #endif
 
-  bfd_put_32 (abfd, value, PRIV (output_buf) + PRIV (output_size));
+  bfd_put_32 (abfd, (bfd_vma) value, PRIV (output_buf) + PRIV (output_size));
   PRIV (output_size) += 4;
   return;
@@ -923 +930 @@
       return;
     }
-  _bfd_vms_output_byte (abfd, len & 0xff);
+  _bfd_vms_output_byte (abfd, (unsigned int) len & 0xff);
   _bfd_vms_output_dump (abfd, (unsigned char *)value, len);
 }
@@ -942 +949 @@
     return;
 
-  memcpy (PRIV (output_buf) + PRIV (output_size), data, length);
+  memcpy (PRIV (output_buf) + PRIV (output_size), data, (size_t) length);
   PRIV (output_size) += length;
 
@@ -962 +969 @@
   if (count == 0)
     return;
-  memset (PRIV (output_buf) + PRIV (output_size), value, count);
+  memset (PRIV (output_buf) + PRIV (output_size), value, (size_t) count);
   PRIV (output_size) += count;
 
@@ -1034 +1041 @@
     }
 
-  strncpy (out, in, i);
+  strncpy (out, in, (size_t) i);
   in += i;
   out += i;
@@ -1069 +1076 @@
 #endif
 
-  symbol = _bfd_vms_make_empty_symbol (abfd);
+  symbol = bfd_make_empty_symbol (abfd);
   if (symbol == 0)
     return symbol;
@@ -1092 +1099 @@
 
   entry = (vms_symbol_entry *)
-          bfd_hash_lookup (PRIV (vms_symbol_table), name, false, false);
+          bfd_hash_lookup (PRIV (vms_symbol_table), name, FALSE, FALSE);
   if (entry == 0)
     {
@@ -1098 +1105 @@
       _bfd_vms_debug (8,  "creating hash entry for %s\n", name);
 #endif
-      entry = (vms_symbol_entry *)bfd_hash_lookup (PRIV (vms_symbol_table), name, true, false);
+      entry = (vms_symbol_entry *) bfd_hash_lookup (PRIV (vms_symbol_table),
+                                                    name, TRUE, FALSE);
       if (entry != 0)
         {