* ar.c (print_contents): Cast args of bfd_seek to the right types.

	Replace bfd_read call with call to bfd_bread.
	(extract_file): Likewise.

	* objdump.c (dump_section_header): Cast section->filepos to
	unsigned long to suit printf format string.
	* readelf.c (process_section_headers): Similarly for sh_offset.
	(process_unwind): Likewise.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index c9e9087..b659091 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,14 @@
+2001-09-18  Alan Modra  <amodra@bigpond.net.au>
+
+       * ar.c (print_contents): Cast args of bfd_seek to the right types.
+       Replace bfd_read call with call to bfd_bread.
+       (extract_file): Likewise.
+
+       * objdump.c (dump_section_header): Cast section->filepos to
+       unsigned long to suit printf format string.
+       * readelf.c (process_section_headers): Similarly for sh_offset.
+       (process_unwind): Likewise.
+
 2001-09-14  Nick Clifton  <nickc@cambridge.redhat.com>
 
        * strings.c (encoding, encoding_bytes): New variables.

diff --git a/binutils/ar.c b/binutils/ar.c
index 996476c..c0732f0 100644 (file)
--- a/binutils/ar.c
+++ b/binutils/ar.c
@@ -1,5 +1,6 @@
 /* ar.c - Archive modify and extract.
-   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+   2001
    Free Software Foundation, Inc.
 
 This file is part of GNU Binutils.
@@ -827,7 +828,7 @@ print_contents (abfd)
     /* xgettext:c-format */
     printf (_("\n<member %s>\n\n"), bfd_get_filename (abfd));
 
-  bfd_seek (abfd, 0, SEEK_SET);
+  bfd_seek (abfd, (file_ptr) 0, SEEK_SET);
 
   size = buf.st_size;
   while (ncopied < size)
@@ -838,8 +839,7 @@ print_contents (abfd)
       if (tocopy > BUFSIZE)
        tocopy = BUFSIZE;
 
-      nread = bfd_read (cbuf, 1, tocopy, abfd);        /* oops -- broke
-                                                          abstraction!  */
+      nread = bfd_bread (cbuf, (bfd_size_type) tocopy, abfd);
       if (nread != tocopy)
        /* xgettext:c-format */
        fatal (_("%s is not a valid archive"),
@@ -883,7 +883,7 @@ extract_file (abfd)
   if (verbose)
     printf ("x - %s\n", bfd_get_filename (abfd));
 
-  bfd_seek (abfd, 0, SEEK_SET);
+  bfd_seek (abfd, (file_ptr) 0, SEEK_SET);
 
   ostream = NULL;
   if (size == 0)
@@ -907,7 +907,7 @@ extract_file (abfd)
        if (tocopy > BUFSIZE)
          tocopy = BUFSIZE;
 
-       nread = bfd_read (cbuf, 1, tocopy, abfd);
+       nread = bfd_bread (cbuf, (bfd_size_type) tocopy, abfd);
        if (nread != tocopy)
          /* xgettext:c-format */
          fatal (_("%s is not a valid archive"),

diff --git a/binutils/objdump.c b/binutils/objdump.c
index be29232..168f246 100644 (file)
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -287,7 +287,7 @@ dump_section_header (abfd, section, ignored)
   bfd_printf_vma (abfd, bfd_get_section_vma (abfd, section));
   printf ("  ");
   bfd_printf_vma (abfd, section->lma);
-  printf ("  %08lx  2**%u", section->filepos,
+  printf ("  %08lx  2**%u", (unsigned long) section->filepos,
          bfd_get_section_alignment (abfd, section));
   if (! wide_output)
     printf ("\n                ");

diff --git a/binutils/readelf.c b/binutils/readelf.c
index 3457316..cf3c2c2 100644 (file)
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -3085,7 +3085,7 @@ process_section_headers (file)
        {
          putchar (' ');
          print_vma (section->sh_addr, LONG_HEX);
-         printf ("  %8.8lx", section->sh_offset);
+         printf ("  %8.8lx", (unsigned long) section->sh_offset);
          printf ("\n       ");
          print_vma (section->sh_size, LONG_HEX);
          printf ("  ");
@@ -3650,7 +3650,7 @@ process_unwind (file)
            printf ("'%s'", SECTION_NAME (unwsec));
 
          printf (_(" at offset 0x%lx contains %lu entries:\n"),
-                 unwsec->sh_offset,
+                 (unsigned long) unwsec->sh_offset,
                  (unsigned long) (unwsec->sh_size / (3 * addr_size)));
 
          (void) slurp_ia64_unwind_table (file, & aux, unwsec);