From cdb2ca5d9f4fe4c3ac1d930394f088aed5d944ac Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Fri, 10 Jun 2016 10:39:35 -0700 Subject: [PATCH] Fix misc-macro-parentheses warnings in system/core. Add parentheses around macro arguments used beside operators. Bug: 28705665 Change-Id: I9226f319e283be640eddc31687f75b51a8ef0ac6 --- fastboot/engine.cpp | 2 +- healthd/healthd_mode_charger.cpp | 2 +- init/util.h | 2 +- trusty/storage/tests/main.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fastboot/engine.cpp b/fastboot/engine.cpp index db5d0e0b2..a245e492e 100644 --- a/fastboot/engine.cpp +++ b/fastboot/engine.cpp @@ -38,7 +38,7 @@ #include #include -#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) +#define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0])) #define OP_DOWNLOAD 1 #define OP_COMMAND 2 diff --git a/healthd/healthd_mode_charger.cpp b/healthd/healthd_mode_charger.cpp index 58466263a..612885bc7 100644 --- a/healthd/healthd_mode_charger.cpp +++ b/healthd/healthd_mode_charger.cpp @@ -58,7 +58,7 @@ char *locale; #define min(a,b) ((a) < (b) ? (a) : (b)) #endif -#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) +#define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0])) #define MSEC_PER_SEC (1000LL) #define NSEC_PER_MSEC (1000000LL) diff --git a/init/util.h b/init/util.h index c2efb0145..b9496a9e2 100644 --- a/init/util.h +++ b/init/util.h @@ -23,7 +23,7 @@ #include #include -#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) +#define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0])) #define COLDBOOT_DONE "/dev/.coldboot_done" diff --git a/trusty/storage/tests/main.cpp b/trusty/storage/tests/main.cpp index a771b877d..1fd6f8ddc 100644 --- a/trusty/storage/tests/main.cpp +++ b/trusty/storage/tests/main.cpp @@ -23,7 +23,7 @@ #define TRUSTY_DEVICE_NAME "/dev/trusty-ipc-dev0" -#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) +#define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0])) static inline bool is_32bit_aligned(size_t sz) {