From 3feb17c452c4e99b8c937132e401baefb8b57336 Mon Sep 17 00:00:00 2001 From: Evgeniy Stepanov Date: Tue, 30 Jul 2013 13:16:52 +0000 Subject: [PATCH] [sanitizer] Tweak read syscall handler signature for consistency. llvm-svn: 187417 --- compiler-rt/include/sanitizer/linux_syscall_hooks.h | 4 ++-- .../lib/sanitizer_common/sanitizer_common_syscalls.inc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler-rt/include/sanitizer/linux_syscall_hooks.h b/compiler-rt/include/sanitizer/linux_syscall_hooks.h index 710e6893374f..5f898228fef1 100644 --- a/compiler-rt/include/sanitizer/linux_syscall_hooks.h +++ b/compiler-rt/include/sanitizer/linux_syscall_hooks.h @@ -33,7 +33,7 @@ void __sanitizer_syscall_pre_wait4(int pid, int *status, int options, void *r); void __sanitizer_syscall_pre_waitpid(int pid, int *status, int options); void __sanitizer_syscall_pre_clock_gettime(int clk_id, void *tp); void __sanitizer_syscall_pre_clock_getres(int clk_id, void *tp); -void __sanitizer_syscall_pre_read(unsigned int fd, char *buf, size_t count); +void __sanitizer_syscall_pre_read(unsigned int fd, void *buf, size_t count); void __sanitizer_syscall_post_rt_sigpending(long res, void *p, size_t s); void __sanitizer_syscall_post_getdents(long res, int fd, void *dirp, int count); @@ -47,7 +47,7 @@ void __sanitizer_syscall_post_waitpid(long res, int pid, int *status, int options); void __sanitizer_syscall_post_clock_gettime(long res, int clk_id, void *tp); void __sanitizer_syscall_post_clock_getres(long res, int clk_id, void *tp); -void __sanitizer_syscall_post_read(long res, unsigned int fd, char *buf, size_t count); +void __sanitizer_syscall_post_read(long res, unsigned int fd, void *buf, size_t count); // And now a few syscalls we don't handle yet. diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_common_syscalls.inc b/compiler-rt/lib/sanitizer_common/sanitizer_common_syscalls.inc index 5f4b24c0f59f..3f728d340492 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_common_syscalls.inc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_common_syscalls.inc @@ -162,11 +162,11 @@ POST_SYSCALL(clock_getres)(long res, int clk_id, if (res == 0 && tp) POST_WRITE(tp, sizeof(*tp)); } -PRE_SYSCALL(read)(unsigned int fd, char *buf, uptr count) { +PRE_SYSCALL(read)(unsigned int fd, void *buf, uptr count) { if (buf) PRE_WRITE(buf, count); } -POST_SYSCALL(read)(long res, unsigned int fd, char *buf, uptr count) { +POST_SYSCALL(read)(long res, unsigned int fd, void *buf, uptr count) { if (res > 0 && buf) POST_WRITE(buf, res); }