Merge devo/bfd with GDB's bfd.

[deliverable/binutils-gdb.git] / bfd / libbfd.c

diff --git a/bfd/libbfd.c b/bfd/libbfd.c
index 9998690f042f7360af7831df33b11f86a4ae4e17..f61234377d8378e1302a628c9581a535384d8893 100644 (file)
--- a/bfd/libbfd.c
+++ b/bfd/libbfd.c
@@ -56,12 +56,14 @@ bfd *ignore;
 {
   return (void *)NULL;
 }
+
 int 
 bfd_0(ignore)
 bfd *ignore;
 {
   return 0;
 }
+
 unsigned int 
 bfd_0u(ignore)
 bfd *ignore;
@@ -115,10 +117,10 @@ char *
 zalloc (size)
      size_t size;
 {
-  char *ptr = malloc (size);
+  char *ptr = (char *) malloc (size);
 
   if ((ptr != NULL) && (size != 0))
-    bzero (ptr, size);
+   memset(ptr,0, size);
 
   return ptr;
 }
@@ -136,7 +138,7 @@ zalloc (size)
 
 size_t
 bfd_read (ptr, size, nitems, abfd)
-     void *ptr;
+     PTR ptr;
      size_t size;
      size_t nitems;
      bfd *abfd;
@@ -146,19 +148,19 @@ bfd_read (ptr, size, nitems, abfd)
 
 size_t
 bfd_write (ptr, size, nitems, abfd)
-     void *ptr;
+     PTR ptr;
      size_t size;
      size_t nitems;
      bfd *abfd;
 {
-  return  fwrite (ptr, 1, size*nitems, bfd_cache_lookup(abfd));
+  return fwrite (ptr, 1, size*nitems, bfd_cache_lookup(abfd));
 }
 
 int
 bfd_seek (abfd, position, direction)
-bfd *abfd;
-file_ptr position;
-int direction;
+bfd * CONST abfd;
+CONST file_ptr position;
+CONST int direction;
 {
        /* For the time being, a bfd may not seek to it's end.  The
           problem is that we don't easily have a way to recognize