diff options
| author | Tristan Gingold <gingold@adacore.com> | 2009-12-11 15:42:38 +0000 |
|---|---|---|
| committer | Tristan Gingold <gingold@adacore.com> | 2009-12-11 15:42:38 +0000 |
| commit | f664f618421da4960487b04a2ab5e550e3a003ed (patch) | |
| tree | a70a49b73b9dc521d12a43ec94f40286d7d92133 | |
| parent | 91d6fa6a035cc7d0b7be5c99c194a64cb80924b0 (diff) | |
| download | gdb-f664f618421da4960487b04a2ab5e550e3a003ed.zip gdb-f664f618421da4960487b04a2ab5e550e3a003ed.tar.gz gdb-f664f618421da4960487b04a2ab5e550e3a003ed.tar.bz2 | |
2009-12-11 Tristan Gingold <gingold@adacore.com>
* som.c (bfd_som_set_subsection_attributes)
(bfd_section_from_som_symbol, som_reloc_queue_fix): Fix shadowed
variable warnings.
* cache.c (close_one): Likewise.
| -rw-r--r-- | bfd/ChangeLog | 7 | ||||
| -rw-r--r-- | bfd/cache.c | 20 | ||||
| -rw-r--r-- | bfd/som.c | 18 |
3 files changed, 26 insertions, 19 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index d11f190..0d2cfdd 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2009-12-11 Tristan Gingold <gingold@adacore.com> + + * som.c (bfd_som_set_subsection_attributes) + (bfd_section_from_som_symbol, som_reloc_queue_fix): Fix shadowed + variable warnings. + * cache.c (close_one): Likewise. + 2009-12-11 Nick Clifton <nickc@redhat.com> * warning.m4 (GCC_WARN_CFLAGS): Add -Wshadow. diff --git a/bfd/cache.c b/bfd/cache.c index cf1869d..2239c28 100644 --- a/bfd/cache.c +++ b/bfd/cache.c @@ -144,33 +144,33 @@ bfd_cache_delete (bfd *abfd) static bfd_boolean close_one (void) { - register bfd *kill; + register bfd *to_kill; if (bfd_last_cache == NULL) - kill = NULL; + to_kill = NULL; else { - for (kill = bfd_last_cache->lru_prev; - ! kill->cacheable; - kill = kill->lru_prev) + for (to_kill = bfd_last_cache->lru_prev; + ! to_kill->cacheable; + to_kill = to_kill->lru_prev) { - if (kill == bfd_last_cache) + if (to_kill == bfd_last_cache) { - kill = NULL; + to_kill = NULL; break; } } } - if (kill == NULL) + if (to_kill == NULL) { /* There are no open cacheable BFD's. */ return TRUE; } - kill->where = real_ftell ((FILE *) kill->iostream); + to_kill->where = real_ftell ((FILE *) to_kill->iostream); - return bfd_cache_delete (kill); + return bfd_cache_delete (to_kill); } /* Check to see if the required BFD is the same as the last one @@ -982,12 +982,12 @@ som_reloc_queue_insert (unsigned char *p, to the front of the queue. */ static void -som_reloc_queue_fix (struct reloc_queue *queue, unsigned int index) +som_reloc_queue_fix (struct reloc_queue *queue, unsigned int idx) { - if (index == 0) + if (idx == 0) return; - if (index == 1) + if (idx == 1) { unsigned char *tmp1 = queue[0].reloc; unsigned int tmp2 = queue[0].size; @@ -999,7 +999,7 @@ som_reloc_queue_fix (struct reloc_queue *queue, unsigned int index) return; } - if (index == 2) + if (idx == 2) { unsigned char *tmp1 = queue[0].reloc; unsigned int tmp2 = queue[0].size; @@ -1013,7 +1013,7 @@ som_reloc_queue_fix (struct reloc_queue *queue, unsigned int index) return; } - if (index == 3) + if (idx == 3) { unsigned char *tmp1 = queue[0].reloc; unsigned int tmp2 = queue[0].size; @@ -4239,10 +4239,10 @@ bfd_section_from_som_symbol (bfd *abfd, struct symbol_dictionary_record *symbol) && symbol->symbol_type != ST_SEC_PROG && symbol->symbol_type != ST_MILLICODE)) { - int index = symbol->symbol_info; + int idx = symbol->symbol_info; for (section = abfd->sections; section != NULL; section = section->next) - if (section->target_index == index && som_is_subspace (section)) + if (section->target_index == idx && som_is_subspace (section)) return section; } else @@ -5177,7 +5177,7 @@ bfd_som_set_section_attributes (asection *section, bfd_boolean bfd_som_set_subsection_attributes (asection *section, asection *container, - int access, + int access_ctr, unsigned int sort_key, int quadrant, int comdat, @@ -5194,7 +5194,7 @@ bfd_som_set_subsection_attributes (asection *section, return FALSE; } som_section_data (section)->copy_data->sort_key = sort_key; - som_section_data (section)->copy_data->access_control_bits = access; + som_section_data (section)->copy_data->access_control_bits = access_ctr; som_section_data (section)->copy_data->quadrant = quadrant; som_section_data (section)->copy_data->container = container; som_section_data (section)->copy_data->is_comdat = comdat; |