From 85244e8bc2702f9a46782c5075b832b7c1d96900 Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Tue, 1 Aug 2017 13:49:57 -0700 Subject: [PATCH] Fix misc-macro-parentheses warnings in system/core. Add NOLINT comment to work around clang-tidy error in checking macro arguments used in type expressions. Bug: 28705665 Test: make with WITH_TIDY=1 WITH_TIDY_CHECKS=-*,misc-macro-* \ WITH_TIDY_FLAGS=-header-filter=system/core/.* Change-Id: I7619978c1804e151a11a8b0477e80076bcf21cab --- .../include/backtrace/backtrace_constants.h | 4 ++-- libcutils/include/cutils/list.h | 14 +++++++------- libcutils/include/cutils/native_handle.h | 4 ++-- liblog/include/log/log_main.h | 4 ++-- libutils/include/utils/Singleton.h | 2 +- logcat/tests/liblogcat_test.cpp | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/libbacktrace/include/backtrace/backtrace_constants.h b/libbacktrace/include/backtrace/backtrace_constants.h index f8c15755f..373a1e583 100644 --- a/libbacktrace/include/backtrace/backtrace_constants.h +++ b/libbacktrace/include/backtrace/backtrace_constants.h @@ -20,10 +20,10 @@ // When the pid to be traced is set to this value, then trace the current // process. If the tid value is not BACKTRACE_NO_TID, then the specified // thread from the current process will be traced. -#define BACKTRACE_CURRENT_PROCESS -1 +#define BACKTRACE_CURRENT_PROCESS (-1) // When the tid to be traced is set to this value, then trace the specified // current thread of the specified pid. -#define BACKTRACE_CURRENT_THREAD -1 +#define BACKTRACE_CURRENT_THREAD (-1) #define MAX_BACKTRACE_FRAMES 64 diff --git a/libcutils/include/cutils/list.h b/libcutils/include/cutils/list.h index 4ba2cfd49..dfdc53be6 100644 --- a/libcutils/include/cutils/list.h +++ b/libcutils/include/cutils/list.h @@ -34,20 +34,20 @@ struct listnode #define list_declare(name) \ struct listnode name = { \ - .next = &name, \ - .prev = &name, \ + .next = &(name), \ + .prev = &(name), \ } #define list_for_each(node, list) \ - for (node = (list)->next; node != (list); node = node->next) + for ((node) = (list)->next; (node) != (list); (node) = (node)->next) #define list_for_each_reverse(node, list) \ - for (node = (list)->prev; node != (list); node = node->prev) + for ((node) = (list)->prev; (node) != (list); (node) = (node)->prev) #define list_for_each_safe(node, n, list) \ - for (node = (list)->next, n = node->next; \ - node != (list); \ - node = n, n = node->next) + for ((node) = (list)->next, (n) = (node)->next; \ + (node) != (list); \ + (node) = (n), (n) = (node)->next) static inline void list_init(struct listnode *node) { diff --git a/libcutils/include/cutils/native_handle.h b/libcutils/include/cutils/native_handle.h index 7d6a98802..55754b5a4 100644 --- a/libcutils/include/cutils/native_handle.h +++ b/libcutils/include/cutils/native_handle.h @@ -25,8 +25,8 @@ extern "C" { /* Declare a char array for use with native_handle_init */ #define NATIVE_HANDLE_DECLARE_STORAGE(name, maxFds, maxInts) \ - alignas(native_handle_t) char name[ \ - sizeof(native_handle_t) + sizeof(int) * (maxFds + maxInts)] + alignas(native_handle_t) char (name)[ \ + sizeof(native_handle_t) + sizeof(int) * ((maxFds) + (maxInts))] typedef struct native_handle { diff --git a/liblog/include/log/log_main.h b/liblog/include/log/log_main.h index da1615828..5a3f04ca8 100644 --- a/liblog/include/log/log_main.h +++ b/liblog/include/log/log_main.h @@ -355,11 +355,11 @@ int __android_log_is_loggable_len(int prio, const char* tag, size_t len, #if LOG_NDEBUG /* Production */ #define android_testLog(prio, tag) \ - (__android_log_is_loggable_len(prio, tag, (tag && *tag) ? strlen(tag) : 0, \ + (__android_log_is_loggable_len(prio, tag, ((tag) && *(tag)) ? strlen(tag) : 0, \ ANDROID_LOG_DEBUG) != 0) #else #define android_testLog(prio, tag) \ - (__android_log_is_loggable_len(prio, tag, (tag && *tag) ? strlen(tag) : 0, \ + (__android_log_is_loggable_len(prio, tag, ((tag) && *(tag)) ? strlen(tag) : 0, \ ANDROID_LOG_VERBOSE) != 0) #endif diff --git a/libutils/include/utils/Singleton.h b/libutils/include/utils/Singleton.h index a989a4703..abb72f510 100644 --- a/libutils/include/utils/Singleton.h +++ b/libutils/include/utils/Singleton.h @@ -82,7 +82,7 @@ private: #define ANDROID_SINGLETON_STATIC_INSTANCE(TYPE) \ template<> ::android::Mutex \ (::android::Singleton< TYPE >::sLock)(::android::Mutex::PRIVATE); \ - template<> TYPE* ::android::Singleton< TYPE >::sInstance(0); \ + template<> TYPE* ::android::Singleton< TYPE >::sInstance(0); /* NOLINT */ \ template class ::android::Singleton< TYPE >; diff --git a/logcat/tests/liblogcat_test.cpp b/logcat/tests/liblogcat_test.cpp index 9e9a2c25f..c8a00da5d 100644 --- a/logcat/tests/liblogcat_test.cpp +++ b/logcat/tests/liblogcat_test.cpp @@ -17,8 +17,8 @@ #include #define logcat_define(context) android_logcat_context context -#define logcat_popen(context, command) android_logcat_popen(&context, command) -#define logcat_pclose(context, fp) android_logcat_pclose(&context, fp) +#define logcat_popen(context, command) android_logcat_popen(&(context), command) +#define logcat_pclose(context, fp) android_logcat_pclose(&(context), fp) #define logcat_system(command) android_logcat_system(command) #define logcat liblogcat