diff options
| author | Doug Kwan <dougkwan@google.com> | 2009-12-15 02:02:39 +0000 |
|---|---|---|
| committer | Doug Kwan <dougkwan@google.com> | 2009-12-15 02:02:39 +0000 |
| commit | e7f8eadb7897a84b7e76370aee406ea53a88cec6 (patch) | |
| tree | c798402f3070becd20ffee8b831a96e863146cc5 /bfd | |
| parent | 4c807e72625c17af7cd55814b4dd02a94c5179ab (diff) | |
| download | gdb-e7f8eadb7897a84b7e76370aee406ea53a88cec6.zip gdb-e7f8eadb7897a84b7e76370aee406ea53a88cec6.tar.gz gdb-e7f8eadb7897a84b7e76370aee406ea53a88cec6.tar.bz2 | |
2009-12-14 Doug Kwan <dougkwan@google.com>
bfd/ChangeLog:
* opncls.c (bfd_opnr_iovec): Rename parameters to avoid shawdowed
variable warnings.
* bfd-in2.h: Regnenerate.
include/ChangeLog:
* bfdlink.h (struct bfd_link_callbacks): Rename function parameters
to avoid shadowed variable warnings.
* dis-asm.h (struct disassemble_info): Ditto.
(disassemble_init_for_target): Ditto.
(init_disassemble_info): Ditto.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/bfd-in2.h | 8 | ||||
| -rw-r--r-- | bfd/opncls.c | 44 |
3 files changed, 32 insertions, 26 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 5b339a9..443844d 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2009-12-14 Doug Kwan <dougkwan@google.com> + + * opncls.c (bfd_opnr_iovec): Rename parameters to avoid shawdowed + variable warnings. + * bfd-in2.h: Regnenerate. + 2009-12-12 Nick Clifton <nickc@redhat.com> * coff-arm.c (coff_arm_rtype_to_howto): Fix shadowed variable diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index aa58ca6..c78e17d 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -971,17 +971,17 @@ bfd *bfd_fdopenr (const char *filename, const char *target, int fd); bfd *bfd_openstreamr (const char *, const char *, void *); bfd *bfd_openr_iovec (const char *filename, const char *target, - void *(*open) (struct bfd *nbfd, + void *(*open_func) (struct bfd *nbfd, void *open_closure), void *open_closure, - file_ptr (*pread) (struct bfd *nbfd, + file_ptr (*pread_func) (struct bfd *nbfd, void *stream, void *buf, file_ptr nbytes, file_ptr offset), - int (*close) (struct bfd *nbfd, + int (*close_func) (struct bfd *nbfd, void *stream), - int (*stat) (struct bfd *abfd, + int (*stat_func) (struct bfd *abfd, void *stream, struct stat *sb)); diff --git a/bfd/opncls.c b/bfd/opncls.c index 7a884c2..520cab6 100644 --- a/bfd/opncls.c +++ b/bfd/opncls.c @@ -376,47 +376,47 @@ FUNCTION SYNOPSIS bfd *bfd_openr_iovec (const char *filename, const char *target, - void *(*open) (struct bfd *nbfd, - void *open_closure), + void *(*open_func) (struct bfd *nbfd, + void *open_closure), void *open_closure, - file_ptr (*pread) (struct bfd *nbfd, - void *stream, - void *buf, - file_ptr nbytes, - file_ptr offset), - int (*close) (struct bfd *nbfd, - void *stream), - int (*stat) (struct bfd *abfd, - void *stream, - struct stat *sb)); + file_ptr (*pread_func) (struct bfd *nbfd, + void *stream, + void *buf, + file_ptr nbytes, + file_ptr offset), + int (*close_func) (struct bfd *nbfd, + void *stream), + int (*stat_func) (struct bfd *abfd, + void *stream, + struct stat *sb)); DESCRIPTION Create and return a BFD backed by a read-only @var{stream}. - The @var{stream} is created using @var{open}, accessed using - @var{pread} and destroyed using @var{close}. + The @var{stream} is created using @var{open_func}, accessed using + @var{pread_func} and destroyed using @var{close_func}. Calls <<bfd_find_target>>, so @var{target} is interpreted as by that function. - Calls @var{open} (which can call <<bfd_zalloc>> and + Calls @var{open_func} (which can call <<bfd_zalloc>> and <<bfd_get_filename>>) to obtain the read-only stream backing - the BFD. @var{open} either succeeds returning the + the BFD. @var{open_func} either succeeds returning the non-<<NULL>> @var{stream}, or fails returning <<NULL>> (setting <<bfd_error>>). - Calls @var{pread} to request @var{nbytes} of data from + Calls @var{pread_func} to request @var{nbytes} of data from @var{stream} starting at @var{offset} (e.g., via a call to - <<bfd_read>>). @var{pread} either succeeds returning the + <<bfd_read>>). @var{pread_func} either succeeds returning the number of bytes read (which can be less than @var{nbytes} when end-of-file), or fails returning -1 (setting <<bfd_error>>). - Calls @var{close} when the BFD is later closed using - <<bfd_close>>. @var{close} either succeeds returning 0, or + Calls @var{close_func} when the BFD is later closed using + <<bfd_close>>. @var{close_func} either succeeds returning 0, or fails returning -1 (setting <<bfd_error>>). - Calls @var{stat} to fill in a stat structure for bfd_stat, - bfd_get_size, and bfd_get_mtime calls. @var{stat} returns 0 + Calls @var{stat_func} to fill in a stat structure for bfd_stat, + bfd_get_size, and bfd_get_mtime calls. @var{stat_func} returns 0 on success, or returns -1 on failure (setting <<bfd_error>>). If <<bfd_openr_iovec>> returns <<NULL>> then an error has |