summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChih-Hung Hsieh2016-06-10 12:39:35 -0500
committerChih-Hung Hsieh2016-06-22 16:33:13 -0500
commitcdb2ca5d9f4fe4c3ac1d930394f088aed5d944ac (patch)
tree782f71d0dab91d3e609d93279179b35593e77c11
parent863d8e11b9b62388d9d00d7192b5e6f39fa089fa (diff)
downloadplatform-system-core-cdb2ca5d9f4fe4c3ac1d930394f088aed5d944ac.tar.gz
platform-system-core-cdb2ca5d9f4fe4c3ac1d930394f088aed5d944ac.tar.xz
platform-system-core-cdb2ca5d9f4fe4c3ac1d930394f088aed5d944ac.zip
Fix misc-macro-parentheses warnings in system/core.
Add parentheses around macro arguments used beside operators. Bug: 28705665 Change-Id: I9226f319e283be640eddc31687f75b51a8ef0ac6
-rw-r--r--fastboot/engine.cpp2
-rw-r--r--healthd/healthd_mode_charger.cpp2
-rw-r--r--init/util.h2
-rw-r--r--trusty/storage/tests/main.cpp2
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 @@
38#include <sys/types.h> 38#include <sys/types.h>
39#include <unistd.h> 39#include <unistd.h>
40 40
41#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) 41#define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
42 42
43#define OP_DOWNLOAD 1 43#define OP_DOWNLOAD 1
44#define OP_COMMAND 2 44#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;
58#define min(a,b) ((a) < (b) ? (a) : (b)) 58#define min(a,b) ((a) < (b) ? (a) : (b))
59#endif 59#endif
60 60
61#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) 61#define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
62 62
63#define MSEC_PER_SEC (1000LL) 63#define MSEC_PER_SEC (1000LL)
64#define NSEC_PER_MSEC (1000000LL) 64#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 @@
23#include <string> 23#include <string>
24#include <functional> 24#include <functional>
25 25
26#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) 26#define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
27 27
28#define COLDBOOT_DONE "/dev/.coldboot_done" 28#define COLDBOOT_DONE "/dev/.coldboot_done"
29 29
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 @@
23 23
24#define TRUSTY_DEVICE_NAME "/dev/trusty-ipc-dev0" 24#define TRUSTY_DEVICE_NAME "/dev/trusty-ipc-dev0"
25 25
26#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) 26#define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
27 27
28static inline bool is_32bit_aligned(size_t sz) 28static inline bool is_32bit_aligned(size_t sz)
29{ 29{