From 9d63545d44d2a72544b2aab3c89b5071151bf01a Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Fri, 2 Oct 2015 12:57:41 -0600 Subject: [PATCH] zfm20: fix clang compiler warnings regarding |/& precedence Signed-off-by: Jon Trulson Signed-off-by: Mihai Tudor Panu --- src/zfm20/zfm20.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/zfm20/zfm20.cxx b/src/zfm20/zfm20.cxx index e6b7a66b..932d3b57 100644 --- a/src/zfm20/zfm20.cxx +++ b/src/zfm20/zfm20.cxx @@ -574,8 +574,8 @@ uint8_t ZFM20::search(int slot, uint16_t *id, uint16_t *score) // if it was found, extract the location and the score if (rPkt[9] == ERR_OK) { - *id = (rPkt[10] << 8) & 0xff | rPkt[11] & 0xff; - *score = (rPkt[12] << 8) & 0xff | rPkt[13] & 0xff; + *id = ((rPkt[10] << 8) & 0xff) | (rPkt[11] & 0xff); + *score = ((rPkt[12] << 8) & 0xff) | (rPkt[13] & 0xff); } return rPkt[9]; @@ -596,7 +596,7 @@ uint8_t ZFM20::match(uint16_t *score) getResponse(rPkt, rPktLen); - *score = (rPkt[10] << 8) & 0xff | rPkt[11] & 0xff; + *score = ((rPkt[10] << 8) & 0xff) | (rPkt[11] & 0xff); return rPkt[9]; }