From 1a2262e1c9a2c83bec7521f14181d087c3465988 Mon Sep 17 00:00:00 2001
From: Evgeniy Stepanov <eugeni.stepanov@gmail.com>
Date: Mon, 22 Apr 2013 13:28:26 +0000
Subject: [PATCH] [sanitizer] Fix lint.

llvm-svn: 180012
---
 .../include/sanitizer/linux_syscall_hooks.h        | 14 +++++++++-----
 .../sanitizer_common/sanitizer_common_syscalls.inc |  2 --
 .../lib/sanitizer_common/scripts/check_lint.sh     |  3 ++-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/compiler-rt/include/sanitizer/linux_syscall_hooks.h b/compiler-rt/include/sanitizer/linux_syscall_hooks.h
index 5b0e5ecfb8ef..894d5c2bebff 100644
--- a/compiler-rt/include/sanitizer/linux_syscall_hooks.h
+++ b/compiler-rt/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/compiler-rt/lib/sanitizer_common/sanitizer_common_syscalls.inc b/compiler-rt/lib/sanitizer_common/sanitizer_common_syscalls.inc
index a0de1041443e..da25e6b6ad2c 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_common_syscalls.inc
+++ b/compiler-rt/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/compiler-rt/lib/sanitizer_common/scripts/check_lint.sh b/compiler-rt/lib/sanitizer_common/scripts/check_lint.sh
index 32fa9bfb6691..bddd382e8c9f 100755
--- a/compiler-rt/lib/sanitizer_common/scripts/check_lint.sh
+++ b/compiler-rt/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