diff options
Diffstat (limited to 'linux-user')
| -rw-r--r-- | linux-user/elfload.c | 2 | ||||
| -rw-r--r-- | linux-user/syscall.c | 3 | ||||
| -rw-r--r-- | linux-user/uaccess.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 32767c09cb..fcae78f7f6 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1240,7 +1240,7 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs, } if (interp_elf_ex.e_ident[0] != 0x7f || - strncmp(&interp_elf_ex.e_ident[1], "ELF",3) != 0) { + strncmp((char *)&interp_elf_ex.e_ident[1], "ELF",3) != 0) { interpreter_type &= ~INTERPRETER_ELF; } diff --git a/linux-user/syscall.c b/linux-user/syscall.c index a3b975d8bc..0260756c23 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -947,7 +947,8 @@ static abi_long do_getsockopt(int sockfd, int level, int optname, abi_ulong optval_addr, abi_ulong optlen) { abi_long ret; - int len, lv, val; + int len, val; + socklen_t lv; switch(level) { case TARGET_SOL_SOCKET: diff --git a/linux-user/uaccess.c b/linux-user/uaccess.c index ed50437566..4d506935f8 100644 --- a/linux-user/uaccess.c +++ b/linux-user/uaccess.c @@ -62,7 +62,7 @@ abi_long target_strlen(abi_ulong guest_addr1) ptr = lock_user(VERIFY_READ, guest_addr, max_len, 1); if (!ptr) return -TARGET_EFAULT; - len = qemu_strnlen(ptr, max_len); + len = qemu_strnlen((const char *)ptr, max_len); unlock_user(ptr, guest_addr, 0); guest_addr += len; /* we don't allow wrapping or integer overflow */ |