daily update

[binutils-gdb.git] / bfd / opncls.c

diff --git a/bfd/opncls.c b/bfd/opncls.c
index 7a884c206d1a9798a4f8bf2f55c3982f299e7d39..79c3274bcc107deb5812c80b43750978aa3664a6 100644 (file)
--- a/bfd/opncls.c
+++ b/bfd/opncls.c
@@ -376,47 +376,47 @@ FUNCTION
 
 SYNOPSIS
         bfd *bfd_openr_iovec (const char *filename, const char *target,
-                              void *(*open) (struct bfd *nbfd,
-                                             void *open_closure),
+                              void *(*open_func) (struct bfd *nbfd,
+                                                  void *open_closure),
                               void *open_closure,
-                              file_ptr (*pread) (struct bfd *nbfd,
-                                                 void *stream,
-                                                 void *buf,
-                                                 file_ptr nbytes,
-                                                 file_ptr offset),
-                              int (*close) (struct bfd *nbfd,
-                                            void *stream),
-                             int (*stat) (struct bfd *abfd,
-                                          void *stream,
-                                          struct stat *sb));
+                              file_ptr (*pread_func) (struct bfd *nbfd,
+                                                      void *stream,
+                                                      void *buf,
+                                                      file_ptr nbytes,
+                                                      file_ptr offset),
+                              int (*close_func) (struct bfd *nbfd,
+                                                 void *stream),
+                             int (*stat_func) (struct bfd *abfd,
+                                               void *stream,
+                                               struct stat *sb));
 
 DESCRIPTION
 
         Create and return a BFD backed by a read-only @var{stream}.
-        The @var{stream} is created using @var{open}, accessed using
-        @var{pread} and destroyed using @var{close}.
+        The @var{stream} is created using @var{open_func}, accessed using
+        @var{pread_func} and destroyed using @var{close_func}.
 
        Calls <<bfd_find_target>>, so @var{target} is interpreted as by
        that function.
 
-       Calls @var{open} (which can call <<bfd_zalloc>> and
+       Calls @var{open_func} (which can call <<bfd_zalloc>> and
        <<bfd_get_filename>>) to obtain the read-only stream backing
-       the BFD.  @var{open} either succeeds returning the
+       the BFD.  @var{open_func} either succeeds returning the
        non-<<NULL>> @var{stream}, or fails returning <<NULL>>
        (setting <<bfd_error>>).
 
-       Calls @var{pread} to request @var{nbytes} of data from
+       Calls @var{pread_func} to request @var{nbytes} of data from
        @var{stream} starting at @var{offset} (e.g., via a call to
-       <<bfd_read>>).  @var{pread} either succeeds returning the
+       <<bfd_read>>).  @var{pread_func} either succeeds returning the
        number of bytes read (which can be less than @var{nbytes} when
        end-of-file), or fails returning -1 (setting <<bfd_error>>).
 
-       Calls @var{close} when the BFD is later closed using
-       <<bfd_close>>.  @var{close} either succeeds returning 0, or
+       Calls @var{close_func} when the BFD is later closed using
+       <<bfd_close>>.  @var{close_func} either succeeds returning 0, or
        fails returning -1 (setting <<bfd_error>>).
 
-       Calls @var{stat} to fill in a stat structure for bfd_stat,
-       bfd_get_size, and bfd_get_mtime calls.  @var{stat} returns 0
+       Calls @var{stat_func} to fill in a stat structure for bfd_stat,
+       bfd_get_size, and bfd_get_mtime calls.  @var{stat_func} returns 0
        on success, or returns -1 on failure (setting <<bfd_error>>).
 
        If <<bfd_openr_iovec>> returns <<NULL>> then an error has
@@ -523,12 +523,12 @@ static const struct bfd_iovec opncls_iovec = {
 
 bfd *
 bfd_openr_iovec (const char *filename, const char *target,
-                void *(*_open) (struct bfd *, void *),
+                void *(*open_p) (struct bfd *, void *),
                 void *open_closure,
-                file_ptr (*_pread) (struct bfd *, void *, void *, file_ptr,
-                                   file_ptr),
-                int (*_close) (struct bfd *, void *),
-                int (*_stat) (struct bfd *, void *, struct stat *))
+                file_ptr (*pread_p) (struct bfd *, void *, void *,
+                                     file_ptr, file_ptr),
+                int (*close_p) (struct bfd *, void *),
+                int (*stat_p) (struct bfd *, void *, struct stat *))
 {
   bfd *nbfd;
   const bfd_target *target_vec;
@@ -549,8 +549,8 @@ bfd_openr_iovec (const char *filename, const char *target,
   nbfd->filename = filename;
   nbfd->direction = read_direction;
 
-  /* `open (...)' would get expanded by an the open(2) syscall macro.  */
-  stream = (*_open) (nbfd, open_closure);
+  /* `open_p (...)' would get expanded by an the open(2) syscall macro.  */
+  stream = (*open_p) (nbfd, open_closure);
   if (stream == NULL)
     {
       _bfd_delete_bfd (nbfd);
@@ -559,9 +559,9 @@ bfd_openr_iovec (const char *filename, const char *target,
 
   vec = (struct opncls *) bfd_zalloc (nbfd, sizeof (struct opncls));
   vec->stream = stream;
-  vec->pread = _pread;
-  vec->close = _close;
-  vec->stat = _stat;
+  vec->pread = pread_p;
+  vec->close = close_p;
+  vec->stat = stat_p;
 
   nbfd->iovec = &opncls_iovec;
   nbfd->iostream = vec;
@@ -696,20 +696,7 @@ bfd_close (bfd *abfd)
   if (! BFD_SEND (abfd, _close_and_cleanup, (abfd)))
     return FALSE;
 
-  if ((abfd->flags & BFD_IN_MEMORY) != 0)
-    {
-      /* FIXME: cagney/2004-02-15: Need to implement a BFD_IN_MEMORY io
-        vector.
-        Until that's done, at least don't leak memory.  */
-      struct bfd_in_memory *bim = (struct bfd_in_memory *) abfd->iostream;
-
-      if (bim->buffer != NULL)
-       free (bim->buffer);
-      free (bim);
-      ret = TRUE;
-    }
-  else
-    ret = abfd->iovec->bclose (abfd);
+  ret = abfd->iovec->bclose (abfd);
 
   if (ret)
     _maybe_make_executable (abfd);
@@ -823,6 +810,8 @@ bfd_make_writable (bfd *abfd)
   bim->buffer = 0;
 
   abfd->flags |= BFD_IN_MEMORY;
+  abfd->iovec = &_bfd_memory_iovec;
+  abfd->origin = 0;
   abfd->direction = write_direction;
   abfd->where = 0;
 
@@ -861,7 +850,6 @@ bfd_make_readable (bfd *abfd)
   if (! BFD_SEND (abfd, _close_and_cleanup, (abfd)))
     return FALSE;
 
-
   abfd->arch_info = &bfd_default_arch_struct;
 
   abfd->where = 0;