OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* 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.
This commit is contained in:
Alan Modra 2006-11-20 02:09:56 +00:00
parent 98f0b6ab8c
commit 74633dd074
7 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bfd/ChangeLog
View File

@ -1,3 +1,13 @@
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

3
bfd/bfd-in.h
View File

@ -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;
typedef enum bfd_print_symbol
{

5
bfd/bfd-in2.h
View File

@ -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;
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. */

4
bfd/bfdio.c
View File

@ -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;

2
bfd/cisco-core.c
View File

@ -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;

2
bfd/mmo.c
View File

@ -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;

16
bfd/trad-core.c
View File

@ -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). */