diff options
author | Chih-Hung Hsieh <chh@google.com> | 2016-05-18 15:41:16 -0700 |
---|---|---|
committer | Chih-Hung Hsieh <chh@google.com> | 2016-05-18 15:41:16 -0700 |
commit | eabd5108b310c7dcc773285a15de5cd62b16575e (patch) | |
tree | 24f17d7cbfb0911bc311321efe9ec2b99ee62120 | |
parent | 9b0eb7cdf4ac4650fc3f476c2f5a91c50a18e524 (diff) | |
download | system_core-eabd5108b310c7dcc773285a15de5cd62b16575e.tar.gz system_core-eabd5108b310c7dcc773285a15de5cd62b16575e.tar.bz2 system_core-eabd5108b310c7dcc773285a15de5cd62b16575e.zip |
Fix misc-macro-parentheses warnings in libion, libsparse, libmem*
Bug: 28705665
Change-Id: I3dd5c086787f5e48ab100a71a42109ea0e417bf9
-rw-r--r-- | libion/kernel-headers/linux/ion.h | 2 | ||||
-rw-r--r-- | libmemtrack/memtrack.c | 2 | ||||
-rw-r--r-- | libmemunreachable/tests/LeakFolding_test.cpp | 6 | ||||
-rw-r--r-- | libsparse/output_file.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/libion/kernel-headers/linux/ion.h b/libion/kernel-headers/linux/ion.h index 5af39d04f..3c2808036 100644 --- a/libion/kernel-headers/linux/ion.h +++ b/libion/kernel-headers/linux/ion.h @@ -38,7 +38,7 @@ enum ion_heap_type { /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define ION_HEAP_CARVEOUT_MASK (1 << ION_HEAP_TYPE_CARVEOUT) #define ION_HEAP_TYPE_DMA_MASK (1 << ION_HEAP_TYPE_DMA) -#define ION_NUM_HEAP_IDS sizeof(unsigned int) * 8 +#define ION_NUM_HEAP_IDS (sizeof(unsigned int) * 8) #define ION_FLAG_CACHED 1 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define ION_FLAG_CACHED_NEEDS_SYNC 2 diff --git a/libmemtrack/memtrack.c b/libmemtrack/memtrack.c index 21d9ebdb9..b52821438 100644 --- a/libmemtrack/memtrack.c +++ b/libmemtrack/memtrack.c @@ -26,7 +26,7 @@ #include <hardware/memtrack.h> -#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) +#define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0])) static const memtrack_module_t *module; diff --git a/libmemunreachable/tests/LeakFolding_test.cpp b/libmemunreachable/tests/LeakFolding_test.cpp index 879a3a023..e85df5f58 100644 --- a/libmemunreachable/tests/LeakFolding_test.cpp +++ b/libmemunreachable/tests/LeakFolding_test.cpp @@ -37,10 +37,10 @@ class LeakFoldingTest : public ::testing::Test { Heap heap_; }; -#define buffer_begin(buffer) reinterpret_cast<uintptr_t>(&buffer[0]) -#define buffer_end(buffer) (reinterpret_cast<uintptr_t>(&buffer[0]) + sizeof(buffer)) +#define buffer_begin(buffer) reinterpret_cast<uintptr_t>(&(buffer)[0]) +#define buffer_end(buffer) (reinterpret_cast<uintptr_t>(&(buffer)[0]) + sizeof(buffer)) #define ALLOCATION(heap_walker, buffer) \ - ASSERT_EQ(true, heap_walker.Allocation(buffer_begin(buffer), buffer_end(buffer))) + ASSERT_EQ(true, (heap_walker).Allocation(buffer_begin(buffer), buffer_end(buffer))) TEST_F(LeakFoldingTest, one) { void* buffer1[1] = {nullptr}; diff --git a/libsparse/output_file.c b/libsparse/output_file.c index cd3080038..d2847367a 100644 --- a/libsparse/output_file.c +++ b/libsparse/output_file.c @@ -57,7 +57,7 @@ #define CHUNK_HEADER_LEN (sizeof(chunk_header_t)) #define container_of(inner, outer_t, elem) \ - ((outer_t *)((char *)inner - offsetof(outer_t, elem))) + ((outer_t *)((char *)(inner) - offsetof(outer_t, elem))) struct output_file_ops { int (*open)(struct output_file *, int fd); |