From 2bd7a3efc408e9102f586428ce9ec6e4186e05e2 Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Thu, 19 May 2016 15:21:42 -0700 Subject: [PATCH] Fix misc-macro-parentheses warnings in common_time. Bug: 28705665 Change-Id: Ibdab4631f0e692b8a291faecdeb4a6062f906ea5 --- libs/common_time/common_time_server_api.cpp | 2 +- libs/common_time/common_time_server_packets.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/common_time/common_time_server_api.cpp b/libs/common_time/common_time_server_api.cpp index e0f35a9def8bb..60e65677b2f9a 100644 --- a/libs/common_time/common_time_server_api.cpp +++ b/libs/common_time/common_time_server_api.cpp @@ -285,7 +285,7 @@ void CommonTimeServer::reevaluateAutoDisableState(bool commonClockHasClients) { if (res > 0) \ write(fd, buffer, res); \ } while (0) -#define checked_percentage(a, b) ((0 == b) ? 0.0f : ((100.0f * a) / b)) +#define checked_percentage(a, b) ((0 == (b)) ? 0.0f : ((100.0f * (a)) / (b))) status_t CommonTimeServer::dumpClockInterface(int fd, const Vector& /* args */, diff --git a/libs/common_time/common_time_server_packets.cpp b/libs/common_time/common_time_server_packets.cpp index 9833c37f2519b..c7c893d344997 100644 --- a/libs/common_time/common_time_server_packets.cpp +++ b/libs/common_time/common_time_server_packets.cpp @@ -48,12 +48,12 @@ const uint16_t TimeServicePacketHeader::kCurVersion = 1; #define SERIALIZE_INT32(field_name) SERIALIZE_FIELD(field_name, int32_t, htonl) #define SERIALIZE_INT64(field_name) SERIALIZE_FIELD(field_name, int64_t, htonq) -#define DESERIALIZE_FIELD(field_name, type, converter) \ - do { \ - if ((offset + sizeof(field_name)) > length) \ - return -1; \ - field_name = converter(*((type*)(data + offset))); \ - offset += sizeof(field_name); \ +#define DESERIALIZE_FIELD(field_name, type, converter) \ + do { \ + if ((offset + sizeof(field_name)) > length) \ + return -1; \ + (field_name) = converter(*((type*)(data + offset))); \ + offset += sizeof(field_name); \ } while (0) #define DESERIALIZE_INT16(field_name) DESERIALIZE_FIELD(field_name, int16_t, ntohs) #define DESERIALIZE_INT32(field_name) DESERIALIZE_FIELD(field_name, int32_t, ntohl)