From 24c14221c4cb2175406cd4406043dfd38b9b83fe Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Mon, 10 Dec 2018 10:16:15 -0800 Subject: ART: Fix or nolint cert-dcl16-c Bug: 32619234 Bug: 120614316 Test: m Change-Id: I9ab82cbf3bdcb52a2f85e37d06bbd6d8f415cb15 --- runtime/mirror/var_handle.cc | 2 +- sigchainlib/sigchain.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/mirror/var_handle.cc b/runtime/mirror/var_handle.cc index 085dcab5a8..7c25529347 100644 --- a/runtime/mirror/var_handle.cc +++ b/runtime/mirror/var_handle.cc @@ -1947,7 +1947,7 @@ bool ByteBufferViewVarHandle::Access(AccessMode access_mode, // Determine offset and limit for accesses. int32_t byte_buffer_offset; - if (native_address == 0l) { + if (native_address == 0L) { // Accessing a heap allocated byte buffer. byte_buffer_offset = byte_buffer->GetField32( GetMemberOffset(WellKnownClasses::java_nio_ByteBuffer_offset)); diff --git a/sigchainlib/sigchain.cc b/sigchainlib/sigchain.cc index cbc3ff8483..08ee690e0e 100644 --- a/sigchainlib/sigchain.cc +++ b/sigchainlib/sigchain.cc @@ -100,7 +100,7 @@ static decltype(&sigprocmask64) linked_sigprocmask64; template static void lookup_next_symbol(T* output, T wrapper, const char* name) { - void* sym = dlsym(RTLD_NEXT, name); + void* sym = dlsym(RTLD_NEXT, name); // NOLINT glibc triggers cert-dcl16-c with RTLD_NEXT. if (sym == nullptr) { sym = dlsym(RTLD_DEFAULT, name); if (sym == wrapper || sym == sigaction) { -- cgit v1.2.3-59-g8ed1b