commit e8505bf06e2f17babe479230e62e6e7d1b8c4bca
author Treehugger Robot <treehugger-gerrit@google.com> Mon May 16 18:43:31 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 16 18:43:31 2016 +0000
tree 586cf2899a08c4bd3f727f2632c53f6bdb567281
parent a22b128851c769f18ab6e1dde38ef5a4c32c28c2
parent 434554c687a6735dcac99fbcd78582c80577d70a

Merge "Fix misc-macro-parentheses warnings."

libril/RilSapSocket.cpp

diff --git a/libril/RilSapSocket.cpp b/libril/RilSapSocket.cpp
index e422f34..3c14796 100644
--- a/libril/RilSapSocket.cpp
+++ b/libril/RilSapSocket.cpp
@@ -224,18 +224,18 @@
 #define BYTES_PER_LINE 16
 
 #define NIBBLE_TO_HEX(n) ({ \
-  uint8_t __n = (uint8_t) n & 0x0f; \
+  uint8_t __n = (uint8_t) (n) & 0x0f; \
   __nibble >= 10 ? 'A' + __n - 10: '0' + __n; \
 })
 
 #define HEX_HIGH(b) ({ \
-  uint8_t __b = (uint8_t) b; \
+  uint8_t __b = (uint8_t) (b); \
   uint8_t __nibble = (__b >> 4) & 0x0f; \
   NIBBLE_TO_HEX(__nibble); \
 })
 
 #define HEX_LOW(b) ({ \
-  uint8_t __b = (uint8_t) b; \
+  uint8_t __b = (uint8_t) (b); \
   uint8_t __nibble = __b & 0x0f; \
   NIBBLE_TO_HEX(__nibble); \
 })

libril/ril.cpp

diff --git a/libril/ril.cpp b/libril/ril.cpp
index 30b4220..52f46a7 100644
--- a/libril/ril.cpp
+++ b/libril/ril.cpp
@@ -86,7 +86,7 @@
 #define RESPONSE_UNSOLICITED 1
 
 /* Negative values for private RIL errno's */
-#define RIL_ERRNO_INVALID_RESPONSE -1
+#define RIL_ERRNO_INVALID_RESPONSE (-1)
 
 // request, response, and unsolicited msg print macro
 #define PRINTBUF_SIZE 8096

reference-ril/atchannel.c

diff --git a/reference-ril/atchannel.c b/reference-ril/atchannel.c
index 315d4f9..6a6be30 100644
--- a/reference-ril/atchannel.c
+++ b/reference-ril/atchannel.c
@@ -36,7 +36,7 @@
 #include "misc.h"
 
 
-#define NUM_ELEMS(x) (sizeof(x)/sizeof(x[0]))
+#define NUM_ELEMS(x) (sizeof(x)/sizeof((x)[0]))
 
 #define MAX_AT_RESPONSE (8 * 1024)
 #define HANDSHAKE_RETRY_COUNT 8