diff options
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/aoutx.h | 20 | ||||
| -rw-r--r-- | bfd/bfdwin.c | 4 |
3 files changed, 18 insertions, 11 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 88c6195..1c0a571 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2009-07-02 Tom Tromey <tromey@redhat.com> + + * aoutx.h (aout_get_external_symbols): Declare 'amt' locally. + * bfdwin.c (bfd_free_window): Cast to unsigned long. + 2009-07-01 Nick Clifton <nickc@redhat.com> * elf-m10300.c: Remove trailing white space. diff --git a/bfd/aoutx.h b/bfd/aoutx.h index fccfdeb..480761d 100644 --- a/bfd/aoutx.h +++ b/bfd/aoutx.h @@ -1,6 +1,6 @@ /* BFD semi-generic back-end for a.out binaries. Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 Free Software Foundation, Inc. Written by Cygnus Support. @@ -1294,7 +1294,6 @@ aout_get_external_symbols (bfd *abfd) { bfd_size_type count; struct external_nlist *syms; - bfd_size_type amt; count = exec_hdr (abfd)->a_syms / EXTERNAL_NLIST_SIZE; if (count == 0) @@ -1314,13 +1313,16 @@ aout_get_external_symbols (bfd *abfd) if (syms == NULL) return FALSE; - amt = exec_hdr (abfd)->a_syms; - if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0 - || bfd_bread (syms, amt, abfd) != amt) - { - free (syms); - return FALSE; - } + { + bfd_size_type amt; + amt = exec_hdr (abfd)->a_syms; + if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0 + || bfd_bread (syms, amt, abfd) != amt) + { + free (syms); + return FALSE; + } + } #endif obj_aout_external_syms (abfd) = syms; diff --git a/bfd/bfdwin.c b/bfd/bfdwin.c index 3a35fc9..63ad5ed 100644 --- a/bfd/bfdwin.c +++ b/bfd/bfdwin.c @@ -1,5 +1,5 @@ /* Support for memory-mapped windows into a BFD. - Copyright 1995, 1996, 2001, 2002, 2003, 2005, 2007, 2008 + Copyright 1995, 1996, 2001, 2002, 2003, 2005, 2007, 2008, 2009 Free Software Foundation, Inc. Written by Cygnus Support. @@ -78,7 +78,7 @@ bfd_free_window (bfd_window *windowp) i->refcount--; if (debug_windows) fprintf (stderr, "freeing window @%p<%p,%lx,%p>\n", - windowp, windowp->data, windowp->size, windowp->i); + windowp, windowp->data, (unsigned long) windowp->size, windowp->i); if (i->refcount != 0) return; |