Module Name: src
Committed By: mrg
Date: Fri Oct 18 08:04:47 UTC 2013
Modified Files:
src/external/bsd/libelf/dist: elf_update.c libelf_phdr.c
Log Message:
remove some set-but unused variables.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libelf/dist/elf_update.c \
src/external/bsd/libelf/dist/libelf_phdr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libelf/dist/elf_update.c
diff -u src/external/bsd/libelf/dist/elf_update.c:1.4 src/external/bsd/libelf/dist/elf_update.c:1.5
--- src/external/bsd/libelf/dist/elf_update.c:1.4 Mon Feb 22 10:48:32 2010
+++ src/external/bsd/libelf/dist/elf_update.c Fri Oct 18 08:04:47 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: elf_update.c,v 1.4 2010/02/22 10:48:32 darran Exp $ */
+/* $NetBSD: elf_update.c,v 1.5 2013/10/18 08:04:47 mrg Exp $ */
/*-
* Copyright (c) 2006-2008 Joseph Koshy
@@ -357,7 +357,7 @@ _libelf_resync_sections(Elf *e, off_t rc
static off_t
_libelf_resync_elf(Elf *e)
{
- int ec, eh_class, eh_type;
+ int ec, eh_class;
unsigned int eh_byteorder, eh_version;
size_t align, fsz;
size_t phnum, shnum;
@@ -386,14 +386,12 @@ _libelf_resync_elf(Elf *e)
eh_class = eh32->e_ident[EI_CLASS];
phoff = (uint64_t) eh32->e_phoff;
shoff = (uint64_t) eh32->e_shoff;
- eh_type = eh32->e_type;
eh_version = eh32->e_version;
} else {
eh_byteorder = eh64->e_ident[EI_DATA];
eh_class = eh64->e_ident[EI_CLASS];
phoff = eh64->e_phoff;
shoff = eh64->e_shoff;
- eh_type = eh64->e_type;
eh_version = eh64->e_version;
}
Index: src/external/bsd/libelf/dist/libelf_phdr.c
diff -u src/external/bsd/libelf/dist/libelf_phdr.c:1.4 src/external/bsd/libelf/dist/libelf_phdr.c:1.5
--- src/external/bsd/libelf/dist/libelf_phdr.c:1.4 Mon Feb 22 10:48:33 2010
+++ src/external/bsd/libelf/dist/libelf_phdr.c Fri Oct 18 08:04:47 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: libelf_phdr.c,v 1.4 2010/02/22 10:48:33 darran Exp $ */
+/* $NetBSD: libelf_phdr.c,v 1.5 2013/10/18 08:04:47 mrg Exp $ */
/*-
* Copyright (c) 2006 Joseph Koshy
@@ -45,7 +45,7 @@
void *
_libelf_getphdr(Elf *e, int ec)
{
- size_t phnum, phentsize;
+ size_t phnum;
size_t fsz, msz;
uint64_t phoff;
Elf32_Ehdr *eh32;
@@ -76,11 +76,9 @@ _libelf_getphdr(Elf *e, int ec)
if (ec == ELFCLASS32) {
eh32 = (Elf32_Ehdr *) ehdr;
- phentsize = eh32->e_phentsize;
phoff = (uint64_t) eh32->e_phoff;
} else {
eh64 = (Elf64_Ehdr *) ehdr;
- phentsize = eh64->e_phentsize;
phoff = (uint64_t) eh64->e_phoff;
}
