[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PATCH for-2.10 2/4] bsd-user/elfload.c: Fix set-but-not-
From: |
Peter Maydell |
Subject: |
[Qemu-trivial] [PATCH for-2.10 2/4] bsd-user/elfload.c: Fix set-but-not-used warnings |
Date: |
Tue, 18 Jul 2017 17:26:32 +0100 |
Fix various warnings about set-but-not-used variables on OpenBSD:
bsd-user/elfload.c:1158:15: warning: variable 'mapped_addr' set but not used
[-Wunused-but-set-variable]
bsd-user/elfload.c:1165:9: warning: variable 'status' set but not used
[-Wunused-but-set-variable]
bsd-user/elfload.c:1168:15: warning: variable 'elf_stack' set but not used
[-Wunused-but-set-variable]
Signed-off-by: Peter Maydell <address@hidden>
---
bsd-user/elfload.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c
index 41a1309..7cccf3e 100644
--- a/bsd-user/elfload.c
+++ b/bsd-user/elfload.c
@@ -1155,21 +1155,20 @@ int load_elf_binary(struct linux_binprm * bprm, struct
target_pt_regs * regs,
unsigned int interpreter_type = INTERPRETER_NONE;
unsigned char ibcs2_interpreter;
int i;
- abi_ulong mapped_addr;
struct elf_phdr * elf_ppnt;
struct elf_phdr *elf_phdata;
abi_ulong elf_bss, k, elf_brk;
int retval;
char * elf_interpreter;
abi_ulong elf_entry, interp_load_addr = 0;
- int status;
abi_ulong start_code, end_code, start_data, end_data;
abi_ulong reloc_func_desc = 0;
- abi_ulong elf_stack;
+#ifdef LOW_ELF_STACK
+ abi_ulong elf_stack = ~((abi_ulong)0UL);
+#endif
char passed_fileno[6];
ibcs2_interpreter = 0;
- status = 0;
load_addr = 0;
load_bias = 0;
elf_ex = *((struct elfhdr *) bprm->buf); /* exec-header */
@@ -1221,7 +1220,6 @@ int load_elf_binary(struct linux_binprm * bprm, struct
target_pt_regs * regs,
elf_brk = 0;
- elf_stack = ~((abi_ulong)0UL);
elf_interpreter = NULL;
start_code = ~((abi_ulong)0UL);
end_code = 0;
@@ -1546,7 +1544,7 @@ int load_elf_binary(struct linux_binprm * bprm, struct
target_pt_regs * regs,
and some applications "depend" upon this behavior.
Since we do not have the power to recompile these, we
emulate the SVr4 behavior. Sigh. */
- mapped_addr = target_mmap(0, qemu_host_page_size, PROT_READ |
PROT_EXEC,
+ target_mmap(0, qemu_host_page_size, PROT_READ | PROT_EXEC,
MAP_FIXED | MAP_PRIVATE, -1, 0);
}
--
2.7.4
- Re: [Qemu-trivial] [Qemu-devel] [PATCH for-2.10 4/4] bsd-user/main.c: Fix unused variable warning, (continued)
[Qemu-trivial] [PATCH for-2.10 1/4] bsd-user/mmap.c: Move __thread attribute to right place, Peter Maydell, 2017/07/18
[Qemu-trivial] [PATCH for-2.10 3/4] bsd-user/bsdload.c: Remove write-only id_change variable, Peter Maydell, 2017/07/18
[Qemu-trivial] [PATCH for-2.10 2/4] bsd-user/elfload.c: Fix set-but-not-used warnings,
Peter Maydell <=
Re: [Qemu-trivial] [Qemu-devel] [PATCH for-2.10 0/4] bsd-user: silence warnings on OpenBSD, no-reply, 2017/07/18
Re: [Qemu-trivial] [Qemu-devel] [PATCH for-2.10 0/4] bsd-user: silence warnings on OpenBSD, Peter Maydell, 2017/07/21