/* opncls.c -- open and close a BFD.
- Copyright (C) 1990-1991 Free Software Foundation, Inc.
+ Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
+ 2001
+ Free Software Foundation, Inc.
+
Written by Cygnus Support.
This file is part of BFD, the Binary File Descriptor library.
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., 675 Mass Ave, Cambridge, MA 02139, USA. */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "bfd.h"
#include "sysdep.h"
+#include "objalloc.h"
#include "libbfd.h"
-#include "obstack.h"
-extern void bfd_cache_init PARAMS ((bfd *));
-FILE *bfd_open_file PARAMS ((bfd *));
+
+#ifndef S_IXUSR
+#define S_IXUSR 0100 /* Execute by owner. */
+#endif
+#ifndef S_IXGRP
+#define S_IXGRP 0010 /* Execute by group. */
+#endif
+#ifndef S_IXOTH
+#define S_IXOTH 0001 /* Execute by others. */
+#endif
/* fdopen is a loser -- we should use stdio exclusively. Unfortunately
if we do that we can't use fcntl. */
-
-#define obstack_chunk_alloc bfd_xmalloc_by_size_t
-#define obstack_chunk_free free
+/* FIXME: This is no longer used. */
+long _bfd_chunksize = -1;
/* Return a new BFD. All BFD's are allocated through this routine. */
-bfd *new_bfd PARAMS ((void))
+bfd *
+_bfd_new_bfd ()
{
bfd *nbfd;
- nbfd = (bfd *)zalloc (sizeof (bfd));
- if (!nbfd)
- return 0;
+ nbfd = (bfd *) bfd_zmalloc (sizeof (bfd));
+ if (nbfd == NULL)
+ return NULL;
- bfd_check_init();
- obstack_begin((PTR)&nbfd->memory, 128);
+ nbfd->memory = (PTR) objalloc_create ();
+ if (nbfd->memory == NULL)
+ {
+ bfd_set_error (bfd_error_no_memory);
+ return NULL;
+ }
nbfd->arch_info = &bfd_default_arch_struct;
nbfd->direction = no_direction;
nbfd->iostream = NULL;
nbfd->where = 0;
- nbfd->sections = (asection *)NULL;
+ nbfd->sections = (asection *) NULL;
nbfd->format = bfd_unknown;
- nbfd->my_archive = (bfd *)NULL;
+ nbfd->my_archive = (bfd *) NULL;
nbfd->origin = 0;
nbfd->opened_once = false;
nbfd->output_has_begun = false;
nbfd->section_count = 0;
- nbfd->usrdata = (PTR)NULL;
- nbfd->sections = (asection *)NULL;
+ nbfd->usrdata = (PTR) NULL;
nbfd->cacheable = false;
- nbfd->flags = NO_FLAGS;
+ nbfd->flags = BFD_NO_FLAGS;
nbfd->mtime_set = false;
-
return nbfd;
}
/* Allocate a new BFD as a member of archive OBFD. */
-bfd *new_bfd_contained_in(obfd)
-bfd *obfd;
+bfd *
+_bfd_new_bfd_contained_in (obfd)
+ bfd *obfd;
{
- bfd *nbfd = new_bfd();
- nbfd->xvec = obfd->xvec;
- nbfd->my_archive = obfd;
- nbfd->direction = read_direction;
- nbfd->target_defaulted = obfd->target_defaulted;
- return nbfd;
+ bfd *nbfd;
+
+ nbfd = _bfd_new_bfd ();
+ nbfd->xvec = obfd->xvec;
+ nbfd->my_archive = obfd;
+ nbfd->direction = read_direction;
+ nbfd->target_defaulted = obfd->target_defaulted;
+ return nbfd;
}
/*
SECTION
- Opening and Closing BFDs
+ Opening and closing BFDs
*/
bfd_openr
SYNOPSIS
- bfd *bfd_openr(CONST char *filename, CONST char*target);
+ bfd *bfd_openr(CONST char *filename, CONST char *target);
DESCRIPTION
- This function opens the file supplied (using <<fopen>>) with the target
- supplied, it returns a pointer to the created BFD.
+ Open the file @var{filename} (using <<fopen>>) with the target
+ @var{target}. Return a pointer to the created BFD.
+
+ Calls <<bfd_find_target>>, so @var{target} is interpreted as by
+ that function.
- If NULL is returned then an error has occured. Possible errors
- are <<no_memory>>, <<invalid_target>> or <<system_call>> error.
+ If <<NULL>> is returned then an error has occured. Possible errors
+ are <<bfd_error_no_memory>>, <<bfd_error_invalid_target>> or <<system_call>> error.
*/
bfd *
-DEFUN(bfd_openr, (filename, target),
- CONST char *filename AND
- CONST char *target)
+bfd_openr (filename, target)
+ CONST char *filename;
+ CONST char *target;
{
bfd *nbfd;
- bfd_target *target_vec;
+ const bfd_target *target_vec;
- nbfd = new_bfd();
- if (nbfd == NULL) {
- bfd_error = no_memory;
+ nbfd = _bfd_new_bfd ();
+ if (nbfd == NULL)
return NULL;
- }
target_vec = bfd_find_target (target, nbfd);
- if (target_vec == NULL) {
- bfd_error = invalid_target;
- return NULL;
- }
+ if (target_vec == NULL)
+ {
+ objalloc_free ((struct objalloc *) nbfd->memory);
+ free (nbfd);
+ bfd_set_error (bfd_error_invalid_target);
+ return NULL;
+ }
nbfd->filename = filename;
nbfd->direction = read_direction;
- if (bfd_open_file (nbfd) == NULL) {
- bfd_error = system_call_error; /* File didn't exist, or some such */
- bfd_release(nbfd,0);
- return NULL;
- }
+ if (bfd_open_file (nbfd) == NULL)
+ {
+ /* File didn't exist, or some such */
+ bfd_set_error (bfd_error_system_call);
+ objalloc_free ((struct objalloc *) nbfd->memory);
+ free (nbfd);
+ return NULL;
+ }
+
return nbfd;
}
-
/* Don't try to `optimize' this function:
o - We lock using stack space so that interrupting the locking
bfd *bfd_fdopenr(CONST char *filename, CONST char *target, int fd);
DESCRIPTION
- bfd_fdopenr is to bfd_fopenr much like fdopen is to fopen.
+ <<bfd_fdopenr>> is to <<bfd_fopenr>> much like <<fdopen>> is to <<fopen>>.
It opens a BFD on a file already described by the @var{fd}
supplied.
- When the file is later bfd_closed, the file descriptor will be closed.
+ When the file is later <<bfd_close>>d, the file descriptor will be closed.
If the caller desires that this file descriptor be cached by BFD
(opened as needed, closed as needed to free descriptors for
other opens), with the supplied @var{fd} used as an initial
- file descriptor (but subject to closure at any time), set
- bfd->cacheable nonzero in the returned BFD. The default is to
+ file descriptor (but subject to closure at any time), call
+ bfd_set_cacheable(bfd, 1) on the returned BFD. The default is to
assume no cacheing; the file descriptor will remain open until
- bfd_close, and will not be affected by BFD operations on other
+ <<bfd_close>>, and will not be affected by BFD operations on other
files.
- Possible errors are no_memory, invalid_target and system_call
- error.
+ Possible errors are <<bfd_error_no_memory>>, <<bfd_error_invalid_target>> and <<bfd_error_system_call>>.
*/
bfd *
-DEFUN(bfd_fdopenr,(filename, target, fd),
- CONST char *filename AND
- CONST char *target AND
- int fd)
+bfd_fdopenr (filename, target, fd)
+ CONST char *filename;
+ CONST char *target;
+ int fd;
{
bfd *nbfd;
- bfd_target *target_vec;
+ const bfd_target *target_vec;
int fdflags;
- bfd_error = system_call_error;
-
-#ifdef NO_FCNTL
+ bfd_set_error (bfd_error_system_call);
+#if ! defined(HAVE_FCNTL) || ! defined(F_GETFL)
fdflags = O_RDWR; /* Assume full access */
#else
fdflags = fcntl (fd, F_GETFL, NULL);
#endif
if (fdflags == -1) return NULL;
- nbfd = new_bfd();
-
- if (nbfd == NULL) {
- bfd_error = no_memory;
+ nbfd = _bfd_new_bfd ();
+ if (nbfd == NULL)
return NULL;
- }
target_vec = bfd_find_target (target, nbfd);
- if (target_vec == NULL) {
- bfd_error = invalid_target;
- return NULL;
- }
-#if defined(VMS) || defined(__GO32__)
- nbfd->iostream = (char *)fopen(filename, FOPEN_RB);
+ if (target_vec == NULL)
+ {
+ bfd_set_error (bfd_error_invalid_target);
+ objalloc_free ((struct objalloc *) nbfd->memory);
+ free (nbfd);
+ return NULL;
+ }
+
+#ifndef HAVE_FDOPEN
+ nbfd->iostream = (PTR) fopen (filename, FOPEN_RB);
#else
/* (O_ACCMODE) parens are to avoid Ultrix header file bug */
- switch (fdflags & (O_ACCMODE)) {
- case O_RDONLY: nbfd->iostream = (char *) fdopen (fd, FOPEN_RB); break;
- case O_WRONLY: nbfd->iostream = (char *) fdopen (fd, FOPEN_RUB); break;
- case O_RDWR: nbfd->iostream = (char *) fdopen (fd, FOPEN_RUB); break;
- default: abort ();
- }
+ switch (fdflags & (O_ACCMODE))
+ {
+ case O_RDONLY: nbfd->iostream = (PTR) fdopen (fd, FOPEN_RB); break;
+ case O_WRONLY: nbfd->iostream = (PTR) fdopen (fd, FOPEN_RUB); break;
+ case O_RDWR: nbfd->iostream = (PTR) fdopen (fd, FOPEN_RUB); break;
+ default: abort ();
+ }
#endif
- if (nbfd->iostream == NULL) {
- (void) obstack_free (&nbfd->memory, (PTR)0);
- return NULL;
- }
+
+ if (nbfd->iostream == NULL)
+ {
+ objalloc_free ((struct objalloc *) nbfd->memory);
+ free (nbfd);
+ return NULL;
+ }
/* OK, put everything where it belongs */
be written through, although doing so requires that we end
the previous clause with a preposition. */
/* (O_ACCMODE) parens are to avoid Ultrix header file bug */
- switch (fdflags & (O_ACCMODE)) {
- case O_RDONLY: nbfd->direction = read_direction; break;
- case O_WRONLY: nbfd->direction = write_direction; break;
- case O_RDWR: nbfd->direction = both_direction; break;
- default: abort ();
- }
+ switch (fdflags & (O_ACCMODE))
+ {
+ case O_RDONLY: nbfd->direction = read_direction; break;
+ case O_WRONLY: nbfd->direction = write_direction; break;
+ case O_RDWR: nbfd->direction = both_direction; break;
+ default: abort ();
+ }
+
+ if (! bfd_cache_init (nbfd))
+ {
+ objalloc_free ((struct objalloc *) nbfd->memory);
+ free (nbfd);
+ return NULL;
+ }
+ nbfd->opened_once = true;
+
+ return nbfd;
+}
+
+/*
+FUNCTION
+ bfd_openstreamr
+
+SYNOPSIS
+ bfd *bfd_openstreamr(const char *, const char *, PTR);
+
+DESCRIPTION
+
+ Open a BFD for read access on an existing stdio stream. When
+ the BFD is passed to <<bfd_close>>, the stream will be closed.
+*/
+
+bfd *
+bfd_openstreamr (filename, target, streamarg)
+ const char *filename;
+ const char *target;
+ PTR streamarg;
+{
+ FILE *stream = (FILE *) streamarg;
+ bfd *nbfd;
+ const bfd_target *target_vec;
+
+ nbfd = _bfd_new_bfd ();
+ if (nbfd == NULL)
+ return NULL;
+
+ target_vec = bfd_find_target (target, nbfd);
+ if (target_vec == NULL)
+ {
+ bfd_set_error (bfd_error_invalid_target);
+ objalloc_free ((struct objalloc *) nbfd->memory);
+ free (nbfd);
+ return NULL;
+ }
+
+ nbfd->iostream = (PTR) stream;
+ nbfd->filename = filename;
+ nbfd->direction = read_direction;
- bfd_cache_init (nbfd);
+ if (! bfd_cache_init (nbfd))
+ {
+ objalloc_free ((struct objalloc *) nbfd->memory);
+ free (nbfd);
+ return NULL;
+ }
return nbfd;
}
bfd *bfd_openw(CONST char *filename, CONST char *target);
DESCRIPTION
- Creates a BFD, associated with file @var{filename}, using the
- file format @var{target}, and returns a pointer to it.
+ Create a BFD, associated with file @var{filename}, using the
+ file format @var{target}, and return a pointer to it.
- Possible errors are system_call_error, no_memory,
- invalid_target.
+ Possible errors are <<bfd_error_system_call>>, <<bfd_error_no_memory>>,
+ <<bfd_error_invalid_target>>.
*/
bfd *
-DEFUN(bfd_openw,(filename, target),
- CONST char *filename AND
- CONST char *target)
+bfd_openw (filename, target)
+ CONST char *filename;
+ CONST char *target;
{
bfd *nbfd;
- bfd_target *target_vec;
+ const bfd_target *target_vec;
- bfd_error = system_call_error;
+ bfd_set_error (bfd_error_system_call);
/* nbfd has to point to head of malloc'ed block so that bfd_close may
reclaim it correctly. */
- nbfd = new_bfd();
- if (nbfd == NULL) {
- bfd_error = no_memory;
+ nbfd = _bfd_new_bfd ();
+ if (nbfd == NULL)
return NULL;
- }
target_vec = bfd_find_target (target, nbfd);
- if (target_vec == NULL) return NULL;
+ if (target_vec == NULL)
+ {
+ objalloc_free ((struct objalloc *) nbfd->memory);
+ free (nbfd);
+ return NULL;
+ }
nbfd->filename = filename;
nbfd->direction = write_direction;
- if (bfd_open_file (nbfd) == NULL) {
- bfd_error = system_call_error; /* File not writeable, etc */
- (void) obstack_free (&nbfd->memory, (PTR)0);
- return NULL;
+ if (bfd_open_file (nbfd) == NULL)
+ {
+ bfd_set_error (bfd_error_system_call); /* File not writeable, etc */
+ objalloc_free ((struct objalloc *) nbfd->memory);
+ free (nbfd);
+ return NULL;
}
+
return nbfd;
}
bfd_close
SYNOPSIS
- boolean bfd_close(bfd *);
+ boolean bfd_close(bfd *abfd);
DESCRIPTION
- This function closes a BFD. If the BFD was open for writing,
+ Close a BFD. If the BFD was open for writing,
then pending operations are completed and the file written out
and closed. If the created file is executable, then
<<chmod>> is called to mark it as such.
- All memory attached to the BFD's obstacks is released.
+ All memory attached to the BFD is released.
The file descriptor associated with the BFD is closed (even
- if it was passed in to BFD by bfd_fdopenr).
+ if it was passed in to BFD by <<bfd_fdopenr>>).
RETURNS
<<true>> is returned if all is ok, otherwise <<false>>.
boolean
-DEFUN(bfd_close,(abfd),
- bfd *abfd)
+bfd_close (abfd)
+ bfd *abfd;
{
boolean ret;
- if (!bfd_read_p(abfd))
- if (BFD_SEND_FMT (abfd, _bfd_write_contents, (abfd)) != true)
- return false;
+ if (!bfd_read_p (abfd))
+ {
+ if (! BFD_SEND_FMT (abfd, _bfd_write_contents, (abfd)))
+ return false;
+ }
- if (BFD_SEND (abfd, _close_and_cleanup, (abfd)) != true) return false;
+ if (! BFD_SEND (abfd, _close_and_cleanup, (abfd)))
+ return false;
- ret = bfd_cache_close(abfd);
+ ret = bfd_cache_close (abfd);
/* If the file was open for writing and is now executable,
make it so */
- if (ret == true
+ if (ret
&& abfd->direction == write_direction
- && abfd->flags & EXEC_P) {
- struct stat buf;
- stat(abfd->filename, &buf);
-#ifndef S_IXUSR
-#define S_IXUSR 0100 /* Execute by owner. */
-#endif
-#ifndef S_IXGRP
-#define S_IXGRP 0010 /* Execute by group. */
-#endif
-#ifndef S_IXOTH
-#define S_IXOTH 0001 /* Execute by others. */
-#endif
+ && abfd->flags & EXEC_P)
+ {
+ struct stat buf;
+
+ if (stat (abfd->filename, &buf) == 0)
+ {
+ int mask = umask (0);
+ umask (mask);
+ chmod (abfd->filename,
+ (0777
+ & (buf.st_mode | ((S_IXUSR | S_IXGRP | S_IXOTH) &~ mask))));
+ }
+ }
+
+ objalloc_free ((struct objalloc *) abfd->memory);
+ free (abfd);
- chmod(abfd->filename, 0777 & (buf.st_mode | S_IXUSR | S_IXGRP | S_IXOTH));
- }
- (void) obstack_free (&abfd->memory, (PTR)0);
- (void) free(abfd);
return ret;
}
boolean bfd_close_all_done(bfd *);
DESCRIPTION
- This function closes a BFD. It differs from <<bfd_close>>
+ Close a BFD. Differs from <<bfd_close>>
since it does not complete any pending operations. This
routine would be used if the application had just used BFD for
swapping and didn't want to use any of the writing code.
If the created file is executable, then <<chmod>> is called
to mark it as such.
- All memory attached to the BFD's obstacks is released.
+ All memory attached to the BFD is released.
RETURNS
<<true>> is returned if all is ok, otherwise <<false>>.
*/
boolean
-DEFUN(bfd_close_all_done,(abfd),
- bfd *abfd)
+bfd_close_all_done (abfd)
+ bfd *abfd;
{
boolean ret;
- ret = bfd_cache_close(abfd);
+ ret = bfd_cache_close (abfd);
/* If the file was open for writing and is now executable,
make it so */
- if (ret == true
+ if (ret
&& abfd->direction == write_direction
- && abfd->flags & EXEC_P) {
- struct stat buf;
- stat(abfd->filename, &buf);
-#ifndef S_IXUSR
-#define S_IXUSR 0100 /* Execute by owner. */
-#endif
-#ifndef S_IXGRP
-#define S_IXGRP 0010 /* Execute by group. */
-#endif
-#ifndef S_IXOTH
-#define S_IXOTH 0001 /* Execute by others. */
-#endif
+ && abfd->flags & EXEC_P)
+ {
+ struct stat buf;
+
+ if (stat (abfd->filename, &buf) == 0)
+ {
+ int mask = umask (0);
+ umask (mask);
+ chmod (abfd->filename,
+ (0777
+ & (buf.st_mode | ((S_IXUSR | S_IXGRP | S_IXOTH) &~ mask))));
+ }
+ }
+
+ objalloc_free ((struct objalloc *) abfd->memory);
+ free (abfd);
- chmod(abfd->filename, 0x777 &(buf.st_mode | S_IXUSR | S_IXGRP | S_IXOTH));
- }
- (void) obstack_free (&abfd->memory, (PTR)0);
- (void) free(abfd);
return ret;
}
-
/*
-FUNCTION
- bfd_alloc_size
+FUNCTION
+ bfd_create
SYNOPSIS
- bfd_size_type bfd_alloc_size(bfd *abfd);
+ bfd *bfd_create(CONST char *filename, bfd *templ);
DESCRIPTION
- Return the number of bytes in the obstacks connected to the
- supplied BFD.
+ Create a new BFD in the manner of
+ <<bfd_openw>>, but without opening a file. The new BFD
+ takes the target from the target used by @var{template}. The
+ format is always set to <<bfd_object>>.
*/
-bfd_size_type
-DEFUN(bfd_alloc_size,(abfd),
- bfd *abfd)
+bfd *
+bfd_create (filename, templ)
+ CONST char *filename;
+ bfd *templ;
{
- struct _obstack_chunk *chunk = abfd->memory.chunk;
- size_t size = 0;
- while (chunk) {
- size += chunk->limit - &(chunk->contents[0]);
- chunk = chunk->prev;
- }
- return size;
+ bfd *nbfd;
+
+ nbfd = _bfd_new_bfd ();
+ if (nbfd == NULL)
+ return NULL;
+ nbfd->filename = filename;
+ if (templ)
+ nbfd->xvec = templ->xvec;
+ nbfd->direction = no_direction;
+ bfd_set_format (nbfd, bfd_object);
+ return nbfd;
}
+/*
+FUNCTION
+ bfd_make_writable
+
+SYNOPSIS
+ boolean bfd_make_writable(bfd *abfd);
+
+DESCRIPTION
+ Takes a BFD as created by <<bfd_create>> and converts it
+ into one like as returned by <<bfd_openw>>. It does this
+ by converting the BFD to BFD_IN_MEMORY. It's assumed that
+ you will call <<bfd_make_readable>> on this bfd later.
+
+RETURNS
+ <<true>> is returned if all is ok, otherwise <<false>>.
+*/
+
+boolean
+bfd_make_writable(abfd)
+ bfd *abfd;
+{
+ struct bfd_in_memory *bim;
+
+ if (abfd->direction != no_direction)
+ {
+ bfd_set_error (bfd_error_invalid_operation);
+ return false;
+ }
+
+ bim = (struct bfd_in_memory *) bfd_malloc (sizeof (struct bfd_in_memory));
+ abfd->iostream = (PTR) bim;
+ /* bfd_write will grow these as needed */
+ bim->size = 0;
+ bim->buffer = 0;
+ abfd->flags |= BFD_IN_MEMORY;
+ abfd->direction = write_direction;
+ abfd->where = 0;
+
+ return true;
+}
/*
FUNCTION
- bfd_create
+ bfd_make_readable
SYNOPSIS
- bfd *bfd_create(CONST char *filename, bfd *template);
+ boolean bfd_make_readable(bfd *abfd);
DESCRIPTION
- This routine creates a new BFD in the manner of
- <<bfd_openw>>, but without opening a file. The new BFD
- takes the target from the target used by @var{template}. The
- format is always set to <<bfd_object>>.
+ Takes a BFD as created by <<bfd_create>> and
+ <<bfd_make_writable>> and converts it into one like as
+ returned by <<bfd_openr>>. It does this by writing the
+ contents out to the memory buffer, then reversing the
+ direction.
-*/
+RETURNS
+ <<true>> is returned if all is ok, otherwise <<false>>. */
-bfd *
-DEFUN(bfd_create,(filename, template),
- CONST char *filename AND
- bfd *template)
+boolean
+bfd_make_readable(abfd)
+ bfd *abfd;
{
- bfd *nbfd = new_bfd();
- if (nbfd == (bfd *)NULL) {
- bfd_error = no_memory;
- return (bfd *)NULL;
- }
- nbfd->filename = filename;
- if(template) {
- nbfd->xvec = template->xvec;
- }
- nbfd->direction = no_direction;
- bfd_set_format(nbfd, bfd_object);
- return nbfd;
+ if (abfd->direction != write_direction || !(abfd->flags & BFD_IN_MEMORY))
+ {
+ bfd_set_error (bfd_error_invalid_operation);
+ return false;
+ }
+
+ if (! BFD_SEND_FMT (abfd, _bfd_write_contents, (abfd)))
+ return false;
+
+ if (! BFD_SEND (abfd, _close_and_cleanup, (abfd)))
+ return false;
+
+
+ abfd->arch_info = &bfd_default_arch_struct;
+
+ abfd->where = 0;
+ abfd->sections = (asection *) NULL;
+ abfd->format = bfd_unknown;
+ abfd->my_archive = (bfd *) NULL;
+ abfd->origin = 0;
+ abfd->opened_once = false;
+ abfd->output_has_begun = false;
+ abfd->section_count = 0;
+ abfd->usrdata = (PTR) NULL;
+ abfd->cacheable = false;
+ abfd->flags = BFD_IN_MEMORY;
+ abfd->mtime_set = false;
+
+ abfd->target_defaulted = true;
+ abfd->direction = read_direction;
+ abfd->sections = 0;
+ abfd->symcount = 0;
+ abfd->outsymbols = 0;
+ abfd->tdata.any = 0;
+
+ bfd_check_format(abfd, bfd_object);
+
+ return true;
}
/*
INTERNAL_FUNCTION
- bfd_alloc_by_size_t
+ bfd_alloc
SYNOPSIS
- PTR bfd_alloc_by_size_t(bfd *abfd, size_t wanted);
+ PTR bfd_alloc (bfd *abfd, size_t wanted);
DESCRIPTION
- This function allocates a block of memory in the obstack
- attatched to <<abfd>> and returns a pointer to it.
+ Allocate a block of @var{wanted} bytes of memory attached to
+ <<abfd>> and return a pointer to it.
*/
PTR
-DEFUN(bfd_alloc_by_size_t,(abfd, size),
- bfd *abfd AND
- size_t size)
-{
- PTR res = obstack_alloc(&(abfd->memory), size);
- return res;
-}
-
-DEFUN(void bfd_alloc_grow,(abfd, ptr, size),
- bfd *abfd AND
- PTR ptr AND
- size_t size)
+bfd_alloc (abfd, size)
+ bfd *abfd;
+ size_t size;
{
- (void) obstack_grow(&(abfd->memory), ptr, size);
-}
-DEFUN(PTR bfd_alloc_finish,(abfd),
- bfd *abfd)
-{
- return obstack_finish(&(abfd->memory));
-}
+ PTR ret;
-DEFUN(PTR bfd_alloc, (abfd, size),
- bfd *abfd AND
- size_t size)
-{
- return bfd_alloc_by_size_t(abfd, (size_t)size);
+ ret = objalloc_alloc (abfd->memory, (unsigned long) size);
+ if (ret == NULL)
+ bfd_set_error (bfd_error_no_memory);
+ return ret;
}
-DEFUN(PTR bfd_zalloc,(abfd, size),
- bfd *abfd AND
- size_t size)
+PTR
+bfd_zalloc (abfd, size)
+ bfd *abfd;
+ size_t size;
{
PTR res;
- res = bfd_alloc(abfd, size);
- memset(res, 0, (size_t)size);
+
+ res = bfd_alloc (abfd, size);
+ if (res)
+ memset (res, 0, size);
return res;
}
-DEFUN(PTR bfd_realloc,(abfd, old, size),
- bfd *abfd AND
- PTR old AND
- size_t size)
+/* Free a block allocated for a BFD. */
+
+void
+bfd_release (abfd, block)
+ bfd *abfd;
+ PTR block;
{
- PTR res = bfd_alloc(abfd, size);
- memcpy(res, old, (size_t)size);
- return res;
+ objalloc_free_block ((struct objalloc *) abfd->memory, block);
}
projects / deliverable / binutils-gdb.git / blobdiff