summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-01-08 13:15:20 (GMT)
committerEelco Dolstra <eelco.dolstra@logicblox.com>2016-01-08 13:15:20 (GMT)
commita5a9a9ab9617125c4d1458a98deb7ca9fc0f2fb7 (patch)
treeeea236c1e08e459248a0c5b92803c68fa3ff5bf8
parenta102bdcd70a146a07f960af245fe4182f8d603f1 (diff)
parent49974076ba7084b372a9a2aa857768126093b020 (diff)
downloadpatchelf-a5a9a9ab9617125c4d1458a98deb7ca9fc0f2fb7.zip
patchelf-a5a9a9ab9617125c4d1458a98deb7ca9fc0f2fb7.tar.gz
patchelf-a5a9a9ab9617125c4d1458a98deb7ca9fc0f2fb7.tar.bz2
Merge branch 'patch-4' of https://github.com/darealshinji/patchelf
-rw-r--r--src/patchelf.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/patchelf.cc b/src/patchelf.cc
index ac77107..1751af3 100644
--- a/src/patchelf.cc
+++ b/src/patchelf.cc
@@ -627,7 +627,7 @@ void ElfFile<ElfFileParamNames>::rewriteSectionsLibrary()
/* Write out the replaced sections. */
Elf_Off curOff = startOffset + phdrs.size() * sizeof(Elf_Phdr);
writeReplacedSections(curOff, startPage, startOffset);
- assert((off_t) curOff == startOffset + neededSpace);
+ assert(curOff == startOffset + neededSpace);
/* Move the program header to the start of the new area. */
@@ -696,7 +696,7 @@ void ElfFile<ElfFileParamNames>::rewriteSectionsExecutable()
Elf_Addr firstPage = startAddr - startOffset;
debug("first page is 0x%llx\n", (unsigned long long) firstPage);
- if ((off_t) rdi(hdr->e_shoff) < startOffset) {
+ if (rdi(hdr->e_shoff) < startOffset) {
/* The section headers occur too early in the file and would be
overwritten by the replaced sections. Move them to the end of the file
before proceeding. */
@@ -752,7 +752,7 @@ void ElfFile<ElfFileParamNames>::rewriteSectionsExecutable()
/* Write out the replaced sections. */
writeReplacedSections(curOff, firstPage, 0);
- assert((off_t) curOff == neededSpace);
+ assert(curOff == neededSpace);
rewriteHeaders(firstPage + rdi(hdr->e_phoff));