aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeniy Stepanov <eugeni.stepanov@gmail.com>2013-04-22 13:28:26 +0000
committerEvgeniy Stepanov <eugeni.stepanov@gmail.com>2013-04-22 13:28:26 +0000
commit1d8bc4b25635462c58a81b7db32da289e1ea44bf (patch)
treee69664a7ffc7a10d5c46b96ae5456dd6c55f50fa
parent4aa08fae9b02ba9a0701fe27f58e2645d236798b (diff)
[sanitizer] Fix lint.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@180012 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--include/sanitizer/linux_syscall_hooks.h14
-rw-r--r--lib/sanitizer_common/sanitizer_common_syscalls.inc2
-rwxr-xr-xlib/sanitizer_common/scripts/check_lint.sh3
3 files changed, 11 insertions, 8 deletions
diff --git a/include/sanitizer/linux_syscall_hooks.h b/include/sanitizer/linux_syscall_hooks.h
index 5b0e5ecfb..894d5c2be 100644
--- a/include/sanitizer/linux_syscall_hooks.h
+++ b/include/sanitizer/linux_syscall_hooks.h
@@ -29,15 +29,19 @@ void __sanitizer_syscall_pre_rt_sigpending(void *p, size_t s);
void __sanitizer_syscall_pre_getdents(int fd, void *dirp, int count);
void __sanitizer_syscall_pre_getdents64(int fd, void *dirp, int count);
void __sanitizer_syscall_pre_recvmsg(int sockfd, void *msg, int flags);
-void __sanitizer_syscall_pre_wait4(int pid, int* status, int options, void* r);
+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_post_rt_sigpending(long res, void *p, size_t s);
void __sanitizer_syscall_post_getdents(long res, int fd, void *dirp, int count);
-void __sanitizer_syscall_post_getdents64(long res, int fd, void *dirp, int count);
-void __sanitizer_syscall_post_recvmsg(long res, int sockfd, void *msg, int flags);
-void __sanitizer_syscall_post_wait4(long res, int pid, int* status, int options, void* r);
-void __sanitizer_syscall_post_waitpid(long res, int pid, int *status, int options);
+void __sanitizer_syscall_post_getdents64(long res, int fd, void *dirp,
+ int count);
+void __sanitizer_syscall_post_recvmsg(long res, int sockfd, void *msg,
+ int flags);
+void __sanitizer_syscall_post_wait4(long res, int pid, int *status, int options,
+ void *r);
+void __sanitizer_syscall_post_waitpid(long res, int pid, int *status,
+ int options);
// And now a few syscalls we don't handle yet.
diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc
index a0de10414..da25e6b6a 100644
--- a/lib/sanitizer_common/sanitizer_common_syscalls.inc
+++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc
@@ -40,7 +40,6 @@
// FIXME: do some kind of PRE_READ for all syscall arguments (int(s) and such).
extern "C" {
-
struct sanitizer_kernel_iovec {
void *iov_base;
unsigned long iov_len;
@@ -139,7 +138,6 @@ POST_SYSCALL(waitpid)(long res, int pid, int *status, int options) {
POST_WRITE(status, sizeof(*status));
}
}
-
} // extern "C"
#undef PRE_SYSCALL
diff --git a/lib/sanitizer_common/scripts/check_lint.sh b/lib/sanitizer_common/scripts/check_lint.sh
index 32fa9bfb6..bddd382e8 100755
--- a/lib/sanitizer_common/scripts/check_lint.sh
+++ b/lib/sanitizer_common/scripts/check_lint.sh
@@ -31,6 +31,7 @@ TSAN_TEST_LINT_FILTER=${TSAN_RTL_LINT_FILTER},-runtime/threadsafe_fn,-runtime/in
TSAN_LIT_TEST_LINT_FILTER=${TSAN_TEST_LINT_FILTER},-whitespace/line_length
MSAN_RTL_LINT_FILTER=${COMMON_LINT_FILTER}
COMMON_RTL_INC_LINT_FILTER=${COMMON_LINT_FILTER},-runtime/int,-runtime/sizeof,-runtime/printf
+SANITIZER_INCLUDES_LINT_FILTER=${COMMON_LINT_FILTER},-runtime/int
cd ${LLVM_CHECKOUT}
@@ -44,7 +45,7 @@ COMPILER_RT=projects/compiler-rt
# Headers
SANITIZER_INCLUDES=${COMPILER_RT}/include/sanitizer
-${CPPLINT} --filter=${TSAN_RTL_LINT_FILTER} ${SANITIZER_INCLUDES}/*.h
+${CPPLINT} --filter=${SANITIZER_INCLUDES_LINT_FILTER} ${SANITIZER_INCLUDES}/*.h
# Sanitizer_common
COMMON_RTL=${COMPILER_RT}/lib/sanitizer_common