From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59566) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9zjM-0000Cq-NH for qemu-devel@nongnu.org; Mon, 06 Jun 2016 14:58:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b9zjK-0003oV-Lh for qemu-devel@nongnu.org; Mon, 06 Jun 2016 14:58:31 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:57568) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9zjK-0003oH-EZ for qemu-devel@nongnu.org; Mon, 06 Jun 2016 14:58:30 -0400 From: Peter Maydell Date: Mon, 6 Jun 2016 19:58:18 +0100 Message-Id: <1465239499-5048-18-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1465239499-5048-1-git-send-email-peter.maydell@linaro.org> References: <1465239499-5048-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 17/18] linux-user: Make target_strerror() return 'const char *' List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: patches@linaro.org, Riku Voipio , Laurent Vivier Make target_strerror() return 'const char *' rather than just 'char *'; this will allow us to return constant strings from it for some special cases. Signed-off-by: Peter Maydell --- linux-user/qemu.h | 2 +- linux-user/strace.c | 4 ++-- linux-user/syscall.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/linux-user/qemu.h b/linux-user/qemu.h index 6bd7b32..56f29c3 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -195,7 +195,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, void gemu_log(const char *fmt, ...) GCC_FMT_ATTR(1, 2); extern THREAD CPUState *thread_cpu; void cpu_loop(CPUArchState *env); -char *target_strerror(int err); +const char *target_strerror(int err); int get_osversion(void); void init_qemu_uname_release(void); void fork_start(void); diff --git a/linux-user/strace.c b/linux-user/strace.c index 0810c85..c5980a1 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -281,7 +281,7 @@ print_ipc(const struct syscallname *name, static void print_syscall_ret_addr(const struct syscallname *name, abi_long ret) { - char *errstr = NULL; + const char *errstr = NULL; if (ret < 0) { errstr = target_strerror(-ret); @@ -1594,7 +1594,7 @@ void print_syscall_ret(int num, abi_long ret) { int i; - char *errstr = NULL; + const char *errstr = NULL; for(i=0;i= (abi_ulong)(-4096); } -char *target_strerror(int err) +const char *target_strerror(int err) { if ((err >= ERRNO_TABLE_SIZE) || (err < 0)) { return NULL; -- 1.9.1