Fix check_lint warnings in sanitizers' runtime libraries

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@186328 91177308-0d34-0410-b5e6-96231b3b80d8

7 files changed, 14 insertions, 12 deletions

diff --git a/lib/asan/asan_interceptors.cc b/lib/asan/asan_interceptors.cc
index bdcc4f729..124bd3bc3 100644
--- a/lib/asan/asan_interceptors.cc
+++ b/lib/asan/asan_interceptors.cc
@@ -256,8 +256,10 @@ static void MlockIsUnsupported() {
   static bool printed = false;
   if (printed) return;
   printed = true;
-  if (flags()->verbosity > 0)
-    Printf("INFO: AddressSanitizer ignores mlock/mlockall/munlock/munlockall\n");
+  if (flags()->verbosity > 0) {
+    Printf("INFO: AddressSanitizer ignores "
+           "mlock/mlockall/munlock/munlockall\n");
+  }
 }
 
 INTERCEPTOR(int, mlock, const void *addr, uptr len) {
diff --git a/lib/msan/msan_interceptors.cc b/lib/msan/msan_interceptors.cc
index d5bc84e55..a4c905ca6 100644
--- a/lib/msan/msan_interceptors.cc
+++ b/lib/msan/msan_interceptors.cc
@@ -971,7 +971,8 @@ INTERCEPTOR(int, pthread_create, void *th, void *attr, void *(*callback)(void*),
   return res;
 }
 
-INTERCEPTOR(int, pthread_key_create, __sanitizer_pthread_key_t *key, void (*dtor) (void *)) {
+INTERCEPTOR(int, pthread_key_create, __sanitizer_pthread_key_t *key,
+            void (*dtor)(void *value)) {
   ENSURE_MSAN_INITED();
   int res = REAL(pthread_key_create)(key, dtor);
   if (!res && key)
diff --git a/lib/sanitizer_common/sanitizer_common_interceptors.inc b/lib/sanitizer_common/sanitizer_common_interceptors.inc
index f41152d65..e63c2dfca 100644
--- a/lib/sanitizer_common/sanitizer_common_interceptors.inc
+++ b/lib/sanitizer_common/sanitizer_common_interceptors.inc
@@ -751,7 +751,7 @@ static void unpoison_glob_t(void *ctx, __sanitizer_glob_t *pglob) {
   }
 }
 
-static THREADLOCAL __sanitizer_glob_t* pglob_copy; 
+static THREADLOCAL __sanitizer_glob_t* pglob_copy;
 static THREADLOCAL void* glob_ctx;
 
 static void wrapped_gl_closedir(void *dir) {
diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc
index 8d53b334f..5a8b13fe4 100644
--- a/lib/sanitizer_common/sanitizer_common_syscalls.inc
+++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc
@@ -161,7 +161,6 @@ POST_SYSCALL(clock_getres)(long res, int clk_id,
                            struct sanitizer_kernel_timespec *tp) {
   if (res == 0 && tp) POST_WRITE(tp, sizeof(*tp));
 }
-
 }  // extern "C"
 
 #undef PRE_SYSCALL
diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h
index 4a84e0547..0b98d3a60 100644
--- a/lib/sanitizer_common/sanitizer_platform_interceptors.h
+++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h
@@ -96,7 +96,7 @@
 # define SANITIZER_INTERCEPT_READDIR SI_NOT_WINDOWS
 # define SANITIZER_INTERCEPT_READDIR64 SI_LINUX_NOT_ANDROID
 # define SANITIZER_INTERCEPT_PTRACE SI_LINUX_NOT_ANDROID && \
-  (defined(__i386) || defined (__x86_64))
+  (defined(__i386) || defined (__x86_64))  // NOLINT
 # define SANITIZER_INTERCEPT_SETLOCALE SI_NOT_WINDOWS
 # define SANITIZER_INTERCEPT_GETCWD SI_NOT_WINDOWS
 # define SANITIZER_INTERCEPT_GET_CURRENT_DIR_NAME SI_LINUX
diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
index 16f12ed8d..4ea85ac0d 100644
--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
@@ -172,7 +172,7 @@ namespace __sanitizer {
 #endif
 
 #if SANITIZER_LINUX && !SANITIZER_ANDROID && \
-      (defined(__i386) || defined (__x86_64))
+      (defined(__i386) || defined (__x86_64))  // NOLINT
   unsigned struct_user_regs_struct_sz = sizeof(struct user_regs_struct);
   unsigned struct_user_fpregs_struct_sz = sizeof(struct user_fpregs_struct);
 #if __WORDSIZE == 64
@@ -180,7 +180,7 @@ namespace __sanitizer {
 #else
   unsigned struct_user_fpxregs_struct_sz = sizeof(struct user_fpxregs_struct);
 #endif
-  
+
   int ptrace_getregs = PTRACE_GETREGS;
   int ptrace_setregs = PTRACE_SETREGS;
   int ptrace_getfpregs = PTRACE_GETFPREGS;
diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/lib/sanitizer_common/sanitizer_platform_limits_posix.h
index 781a6554f..416759b39 100644
--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.h
@@ -193,9 +193,9 @@ namespace __sanitizer {
     char **gl_pathv;
     uptr gl_offs;
     int gl_flags;
-    
-    void (*gl_closedir)(void *);
-    void *(*gl_readdir)(void *);
+
+    void (*gl_closedir)(void *dirp);
+    void *(*gl_readdir)(void *dirp);
     void *(*gl_opendir)(const char *);
     int (*gl_lstat)(const char *, void *);
     int (*gl_stat)(const char *, void *);
@@ -208,7 +208,7 @@ namespace __sanitizer {
   extern unsigned path_max;
 
 #if SANITIZER_LINUX && !SANITIZER_ANDROID && \
-      (defined(__i386) || defined (__x86_64))
+      (defined(__i386) || defined (__x86_64))  // NOLINT
   extern unsigned struct_user_regs_struct_sz;
   extern unsigned struct_user_fpregs_struct_sz;
   extern unsigned struct_user_fpxregs_struct_sz;