Skip to content

Commit 4967cdc

Browse files
committed
fix -Wshadow warnings
1 parent 0fcf278 commit 4967cdc

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/patchelf.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -380,8 +380,8 @@ static void checkPointer(const FileContents & contents, void * p, unsigned int s
380380

381381

382382
template<ElfFileParams>
383-
ElfFile<ElfFileParamNames>::ElfFile(FileContents fileContents)
384-
: fileContents(fileContents)
383+
ElfFile<ElfFileParamNames>::ElfFile(FileContents fContents)
384+
: fileContents(fContents)
385385
, contents(fileContents->data())
386386
{
387387
/* Check the ELF header for basic validity. */
@@ -799,8 +799,8 @@ void ElfFile<ElfFileParamNames>::rewriteSectionsLibrary()
799799

800800
/* Compute the total space needed for the replaced sections */
801801
off_t neededSpace = 0;
802-
for (auto & i : replacedSections)
803-
neededSpace += roundUp(i.second.size(), sectionAlignment);
802+
for (auto & s : replacedSections)
803+
neededSpace += roundUp(s.second.size(), sectionAlignment);
804804
debug("needed space is %d\n", neededSpace);
805805

806806
Elf_Off startOffset = roundUp(fileContents->size(), getPageSize());
@@ -1369,7 +1369,7 @@ void ElfFile<ElfFileParamNames>::modifyRPath(RPathOp op,
13691369
return;
13701370
}
13711371

1372-
auto dyn = (Elf_Dyn *)(contents + rdi(shdrDynamic.sh_offset));
1372+
dyn = (Elf_Dyn *)(contents + rdi(shdrDynamic.sh_offset));
13731373
Elf_Dyn * last = dyn;
13741374
for ( ; rdi(dyn->d_tag) != DT_NULL; dyn++) {
13751375
if (rdi(dyn->d_tag) == DT_RPATH) {

0 commit comments

Comments
 (0)