summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeniy Stepanov <eugeni.stepanov@gmail.com>2013-02-20 11:06:07 +0000
committerEvgeniy Stepanov <eugeni.stepanov@gmail.com>2013-02-20 11:06:07 +0000
commit69b109a665247d424874253b412fe9b5253d1702 (patch)
tree5576e5b68f1cd0aab0f953081f30b6045823f087
parenta1b5c09e608933cb2a9edef1488f45f5a94c91a3 (diff)
[sanitizer] Fix lint.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@175615 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/asan/lit_tests/throw_call_test.cc3
-rw-r--r--lib/sanitizer_common/sanitizer_common_interceptors.inc4
-rwxr-xr-xlib/sanitizer_common/scripts/check_lint.sh2
3 files changed, 4 insertions, 5 deletions
diff --git a/lib/asan/lit_tests/throw_call_test.cc b/lib/asan/lit_tests/throw_call_test.cc
index 67aa65622..da258810f 100644
--- a/lib/asan/lit_tests/throw_call_test.cc
+++ b/lib/asan/lit_tests/throw_call_test.cc
@@ -38,9 +38,8 @@ void CheckStack() {
int main(int argc, char** argv) {
try {
Throw();
- } catch (int a) {
+ } catch(int a) {
fprintf(stderr, "a = %d\n", a);
}
CheckStack();
}
-
diff --git a/lib/sanitizer_common/sanitizer_common_interceptors.inc b/lib/sanitizer_common/sanitizer_common_interceptors.inc
index b21fadea2..e8977f0a8 100644
--- a/lib/sanitizer_common/sanitizer_common_interceptors.inc
+++ b/lib/sanitizer_common/sanitizer_common_interceptors.inc
@@ -126,8 +126,8 @@ INTERCEPTOR(SSIZE_T, pwrite64, int fd, void *ptr, OFF64_T count,
#endif
#if SANITIZER_INTERCEPT_PRCTL
-INTERCEPTOR(int, prctl, int option, unsigned long arg2,
- unsigned long arg3, // NOLINT
+INTERCEPTOR(int, prctl, int option,
+ unsigned long arg2, unsigned long arg3, // NOLINT
unsigned long arg4, unsigned long arg5) { // NOLINT
void *ctx;
COMMON_INTERCEPTOR_ENTER(ctx, prctl, option, arg2, arg3, arg4, arg5);
diff --git a/lib/sanitizer_common/scripts/check_lint.sh b/lib/sanitizer_common/scripts/check_lint.sh
index 1f96c749c..d10a2676a 100755
--- a/lib/sanitizer_common/scripts/check_lint.sh
+++ b/lib/sanitizer_common/scripts/check_lint.sh
@@ -23,7 +23,7 @@ CPPLINT=${SCRIPT_DIR}/cpplint/cpplint.py
# TODO: remove some of these filters
COMMON_LINT_FILTER=-build/include,-build/header_guard,-legal/copyright,-whitespace/comments,-readability/casting,\
-build/namespaces
-ASAN_RTL_LINT_FILTER=${COMMON_LINT_FILTER},-readability/check
+ASAN_RTL_LINT_FILTER=${COMMON_LINT_FILTER},-readability/check,-runtime/int
ASAN_TEST_LINT_FILTER=${COMMON_LINT_FILTER},-runtime/sizeof,-runtime/int,-runtime/printf
ASAN_LIT_TEST_LINT_FILTER=${ASAN_TEST_LINT_FILTER},-whitespace/line_length
TSAN_RTL_LINT_FILTER=${COMMON_LINT_FILTER}