From 991168c1ff0df19f00b9afcbee1552b834c2dd15 Mon Sep 17 00:00:00 2001 From: darealshinji Date: Fri, 24 Jul 2015 21:17:46 +0200 Subject: Remove unused parameter `fileMode' I forgot to do that with this commit: https://github.com/NixOS/patchelf/commit/8eb28c00b6a78928cfa91728b1eba911a4ef49c1 Warnings only appear if -Wextra is turned on. --- src/patchelf.cc | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/patchelf.cc b/src/patchelf.cc index ac77107..936c37e 100644 --- a/src/patchelf.cc +++ b/src/patchelf.cc @@ -236,12 +236,11 @@ static void growFile(off_t newSize) } -static void readFile(string fileName, mode_t * fileMode) +static void readFile(string fileName) { struct stat st; if (stat(fileName.c_str(), &st) != 0) error("stat"); fileSize = st.st_size; - *fileMode = st.st_mode; maxSize = fileSize + 32 * 1024 * 1024; contents = (unsigned char *) malloc(fileSize + maxSize); @@ -1379,7 +1378,7 @@ static set neededLibsToAdd; static bool noDefaultLib = false; template -static void patchElf2(ElfFile & elfFile, mode_t fileMode) +static void patchElf2(ElfFile & elfFile) { elfFile.parse(); @@ -1426,9 +1425,7 @@ static void patchElf() debug("Kernel page size is %u bytes\n", getPageSize()); - mode_t fileMode; - - readFile(fileName, &fileMode); + readFile(fileName); /* Check the ELF header for basic validity. */ @@ -1441,13 +1438,13 @@ static void patchElf() contents[EI_VERSION] == EV_CURRENT) { ElfFile elfFile; - patchElf2(elfFile, fileMode); + patchElf2(elfFile); } else if (contents[EI_CLASS] == ELFCLASS64 && contents[EI_VERSION] == EV_CURRENT) { ElfFile elfFile; - patchElf2(elfFile, fileMode); + patchElf2(elfFile); } else { error("ELF executable is not 32/64-bit, little/big-endian, version 1"); -- cgit v0.12