* bfd-in.h (struct stat): Don't typedef.

	* bfdio.c (bfd_get_size): Return a file_ptr.
	* cisco-core.c (cisco_core_file_validate): Use bfd_size_type for nread.
	* mmo.c (mmo_scan): Use file_ptr for curpos.
	* trad-core.c (trad_unix_core): Don't cast statbuf.st_size to
	unsigned long.
	* bfd-in2.h: Regenerate.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index bbd5459..382e217 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,15 @@
 2006-11-20  Alan Modra  <amodra@bigpond.net.au>
 
+       * bfd-in.h (struct stat): Don't typedef.
+       * bfdio.c (bfd_get_size): Return a file_ptr.
+       * cisco-core.c (cisco_core_file_validate): Use bfd_size_type for nread.
+       * mmo.c (mmo_scan): Use file_ptr for curpos.
+       * trad-core.c (trad_unix_core): Don't cast statbuf.st_size to
+       unsigned long.
+       * bfd-in2.h: Regenerate.
+
+2006-11-20  Alan Modra  <amodra@bigpond.net.au>
+
        PR 3532
        * bfd-in.h (struct bfd_hash_table): Reorganize.  Add "frozen".
        * hash.c (bfd_hash_table_init_n): Init frozen.

diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index 35ce396..342c6c1 100644 (file)
--- a/bfd/bfd-in.h
+++ b/bfd/bfd-in.h
@@ -350,7 +350,8 @@ typedef struct bfd_section *sec_ptr;
   (((sec)->rawsize ? (sec)->rawsize : (sec)->size) \
    / bfd_octets_per_byte (bfd))
 
-typedef struct stat stat_type;
+/* Forward define.  */
+struct stat;
 \f
 typedef enum bfd_print_symbol
 {

diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 80eb8a2..480b2d7 100644 (file)
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -357,7 +357,8 @@ typedef struct bfd_section *sec_ptr;
   (((sec)->rawsize ? (sec)->rawsize : (sec)->size) \
    / bfd_octets_per_byte (bfd))
 
-typedef struct stat stat_type;
+/* Forward define.  */
+struct stat;
 \f
 typedef enum bfd_print_symbol
 {
@@ -1110,7 +1111,7 @@ bfd_boolean bfd_fill_in_gnu_debuglink_section
 /* Extracted from bfdio.c.  */
 long bfd_get_mtime (bfd *abfd);
 
-long bfd_get_size (bfd *abfd);
+file_ptr bfd_get_size (bfd *abfd);
 
 /* Extracted from bfdwin.c.  */
 /* Extracted from section.c.  */

diff --git a/bfd/bfdio.c b/bfd/bfdio.c
index 22ea886..0aa82a9 100644 (file)
--- a/bfd/bfdio.c
+++ b/bfd/bfdio.c
@@ -401,7 +401,7 @@ FUNCTION
        bfd_get_size
 
 SYNOPSIS
-       long bfd_get_size (bfd *abfd);
+       file_ptr bfd_get_size (bfd *abfd);
 
 DESCRIPTION
        Return the file size (as read from file system) for the file
@@ -429,7 +429,7 @@ DESCRIPTION
        size reasonable?".
 */
 
-long
+file_ptr
 bfd_get_size (bfd *abfd)
 {
   struct stat buf;

diff --git a/bfd/cisco-core.c b/bfd/cisco-core.c
index 7d63118..7cf623e 100644 (file)
--- a/bfd/cisco-core.c
+++ b/bfd/cisco-core.c
@@ -88,7 +88,7 @@ cisco_core_file_validate (abfd, crash_info_loc)
   char buf[4];
   unsigned int crashinfo_offset;
   crashinfo_external crashinfo;
-  int nread;
+  bfd_size_type nread;
   unsigned int magic;
   unsigned int version;
   unsigned int rambase;

diff --git a/bfd/mmo.c b/bfd/mmo.c
index 077e3a8..731bb10 100644 (file)
--- a/bfd/mmo.c
+++ b/bfd/mmo.c
@@ -1917,7 +1917,7 @@ mmo_scan (bfd *abfd)
                /* This must be the last 32-bit word in an mmo file.
                   Let's find out.  */
                struct stat statbuf;
-               long curpos = bfd_tell (abfd);
+               file_ptr curpos = bfd_tell (abfd);
 
                if (bfd_stat (abfd, &statbuf) < 0)
                  goto error_return;

diff --git a/bfd/trad-core.c b/bfd/trad-core.c
index 2b309c0..c3884fb 100644 (file)
--- a/bfd/trad-core.c
+++ b/bfd/trad-core.c
@@ -114,24 +114,24 @@ trad_unix_core_file_p (abfd)
     if (bfd_stat (abfd, &statbuf) < 0)
       return 0;
 
-    if ((unsigned long) (NBPG * (UPAGES + u.u_dsize
+    if ((ufile_ptr) NBPG * (UPAGES + u.u_dsize
 #ifdef TRAD_CORE_DSIZE_INCLUDES_TSIZE
-                                - u.u_tsize
+                           - u.u_tsize
 #endif
-                                + u.u_ssize))
-       > (unsigned long) statbuf.st_size)
+                           + u.u_ssize)
+       > (ufile_ptr) statbuf.st_size)
       {
        bfd_set_error (bfd_error_wrong_format);
        return 0;
       }
 #ifndef TRAD_CORE_ALLOW_ANY_EXTRA_SIZE
-    if ((unsigned long) (NBPG * (UPAGES + u.u_dsize + u.u_ssize)
+    if (((ufile_ptr) NBPG * (UPAGES + u.u_dsize + u.u_ssize)
 #ifdef TRAD_CORE_EXTRA_SIZE_ALLOWED
        /* Some systems write the file too big.  */
-                        + TRAD_CORE_EXTRA_SIZE_ALLOWED
+        + TRAD_CORE_EXTRA_SIZE_ALLOWED
 #endif
-                        )
-       < (unsigned long) statbuf.st_size)
+        )
+       < (ufile_ptr) statbuf.st_size)
       {
        /* The file is too big.  Maybe it's not a core file
           or we otherwise have bad values for u_dsize and u_ssize).  */