From 98f9dc54ffb4650b16b2d8e68a17bbfff23cb660 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Thu, 3 Mar 2016 14:59:28 -0700 Subject: [PATCH] zfm20: fix narrowing conversions (c++11) Signed-off-by: Jon Trulson Signed-off-by: Mihai Tudor Panu --- src/zfm20/zfm20.cxx | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/zfm20/zfm20.cxx b/src/zfm20/zfm20.cxx index 932d3b57..f0e42c84 100644 --- a/src/zfm20/zfm20.cxx +++ b/src/zfm20/zfm20.cxx @@ -323,10 +323,10 @@ bool ZFM20::verifyPassword() { const int pktLen = 5; uint8_t pkt[pktLen] = {CMD_VERIFY_PASSWORD, - (m_password >> 24) & 0xff, - (m_password >> 16) & 0xff, - (m_password >> 8) & 0xff, - m_password & 0xff }; + static_cast((m_password >> 24) & 0xff), + static_cast((m_password >> 16) & 0xff), + static_cast((m_password >> 8) & 0xff), + static_cast(m_password & 0xff) }; writeCmdPacket(pkt, pktLen); @@ -368,10 +368,10 @@ bool ZFM20::setNewPassword(uint32_t pwd) { const int pktLen = 5; uint8_t pkt[pktLen] = {CMD_SET_PASSWORD, - (pwd >> 24) & 0xff, - (pwd >> 16) & 0xff, - (pwd >> 8) & 0xff, - pwd & 0xff }; + static_cast((pwd >> 24) & 0xff), + static_cast((pwd >> 16) & 0xff), + static_cast((pwd >> 8) & 0xff), + static_cast(pwd & 0xff) }; writeCmdPacket(pkt, pktLen); @@ -398,10 +398,10 @@ bool ZFM20::setNewAddress(uint32_t addr) { const int pktLen = 5; uint8_t pkt[pktLen] = {CMD_SET_ADDRESS, - (addr >> 24) & 0xff, - (addr >> 16) & 0xff, - (addr >> 8) & 0xff, - addr & 0xff }; + static_cast((addr >> 24) & 0xff), + static_cast((addr >> 16) & 0xff), + static_cast((addr >> 8) & 0xff), + static_cast(addr & 0xff) }; writeCmdPacket(pkt, pktLen); @@ -451,7 +451,7 @@ uint8_t ZFM20::image2Tz(int slot) const int pktLen = 2; uint8_t pkt[pktLen] = {CMD_IMG2TZ, - (slot & 0xff)}; + static_cast(slot & 0xff)}; writeCmdPacket(pkt, pktLen); @@ -491,9 +491,9 @@ uint8_t ZFM20::storeModel(int slot, uint16_t id) const int pktLen = 4; uint8_t pkt[pktLen] = {CMD_STORE, - (slot & 0xff), - (id >> 8) & 0xff, - id & 0xff}; + static_cast(slot & 0xff), + static_cast((id >> 8) & 0xff), + static_cast(id & 0xff)}; writeCmdPacket(pkt, pktLen); @@ -510,8 +510,8 @@ uint8_t ZFM20::deleteModel(uint16_t id) { const int pktLen = 5; uint8_t pkt[pktLen] = {CMD_DELETE_TMPL, - (id >> 8) & 0xff, - id & 0xff, + static_cast((id >> 8) & 0xff), + static_cast(id & 0xff), 0x00, 0x01}; @@ -557,7 +557,7 @@ uint8_t ZFM20::search(int slot, uint16_t *id, uint16_t *score) // search from page 0x0000 to page 0x00a3 const int pktLen = 6; uint8_t pkt[pktLen] = {CMD_SEARCH, - (slot & 0xff), + static_cast(slot & 0xff), 0x00, 0x00, 0x00,