/* 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, 2003, 2004
Free Software Foundation, Inc.
Written by Klaus K"ampf (kkaempf@rmi.de)
static vms_section *add_new_contents PARAMS ((bfd *, sec_ptr));
static int hash_string PARAMS ((const char *));
static asymbol *new_symbol PARAMS ((bfd *, char *));
-
+
/*-----------------------------------------------------------------------------*/
#if VMS_DEBUG
/* debug functions */
...
9 almost everything
- level is also identation level. Indentation is performed
+ level is also indentation level. Indentation is performed
if level > 0
*/
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;
}
vms_buf = PRIV (vms_buf);
if (vms_buf == 0)
- {
- bfd_set_error (bfd_error_no_memory);
- return -1;
- }
+ return -1;
switch (PRIV (file_format))
{
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);
return 0;
/* read the record header on Alpha. */
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))
{
bfd_set_error (bfd_error_file_truncated);
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 */
test_start = 2;
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)
{
bfd_set_error (bfd_error_file_truncated);
{
/* 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));
if (PRIV (rec_length) <= 0)
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);
}
remaining = PRIV (rec_length) - test_len + test_start;
#if VMS_DEBUG
- vms_debug (10, "bfd_read remaining %d\n", remaining);
+ vms_debug (10, "bfd_bread remaining %d\n", remaining);
#endif
- if (bfd_read (vms_buf + test_len, 1, remaining, abfd) !=
+ if (bfd_bread (vms_buf + test_len, (bfd_size_type) remaining, abfd) !=
(bfd_size_type) remaining)
{
bfd_set_error (bfd_error_file_truncated);
}
#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
return PRIV (rec_length);
unsigned char *str;
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;
return newstr;
if (sptr != NULL)
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->size);
+ if (newptr->contents == (unsigned char *) NULL)
return NULL;
newptr->offset = 0;
- newptr->size = section->_raw_size;
+ newptr->size = section->size;
newptr->next = 0;
PRIV (vms_section_table)[section->index] = newptr;
return newptr;
}
-/* Save section data & offset to an vms_section structure
- vms_section_table[] holds the vms_section chain */
+/* Save section data & offset to a vms_section structure
+ vms_section_table[] holds the vms_section chain. */
-boolean
+bfd_boolean
_bfd_save_vms_section (abfd, section, data, offset, count)
bfd *abfd;
sec_ptr section;
- PTR data;
+ const PTR data;
file_ptr offset;
bfd_size_type count;
{
if (section->index >= VMS_SECTION_COUNT)
{
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;
}
/* Get vms_section pointer to saved contents for section # index */
rechead);
#endif
- _bfd_vms_output_short (abfd,rectype);
+ _bfd_vms_output_short (abfd, (unsigned int) rectype);
- /* save current output position to fill in lenght later */
+ /* save current output position to fill in length later */
if (PRIV (push_level) > 0)
PRIV (length_pos) = PRIV (output_size);
PRIV (length_pos));
#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;
}
/* 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)
{
#ifndef VMS
/* write length first, see FF_FOREIGN in the input routines */
- fwrite (PRIV (output_buf)+2, 2, 1, (FILE *)abfd->iostream);
+ 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), (size_t) real_size, 1,
+ (FILE *) abfd->iostream);
PRIV (output_size) = 0;
}
vms_debug (6, "_bfd_vms_output_short (%04x)\n", value);
#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;
}
vms_debug (6, "_bfd_vms_output_long (%08lx)\n", value);
#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;
}
(*_bfd_error_handler) (_("_bfd_vms_output_counted called with too many bytes"));
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);
}
if (length == 0)
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;
return;
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;
return;
i = maxlen;
}
- strncpy (out, in, i);
+ strncpy (out, in, (size_t) i);
in += i;
out += i;
_bfd_vms_debug (7, "new_symbol %s\n", name);
#endif
- symbol = _bfd_vms_make_empty_symbol (abfd);
+ symbol = bfd_make_empty_symbol (abfd);
if (symbol == 0)
return symbol;
symbol->name = name;
#endif
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)
{
#if VMS_DEBUG
_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)
{
asymbol *symbol;