CORE-551: Address static analysis issues (#1).

breadwallet · Sep 12, 2019 · f987c67 · f987c67
1 parent 19e2427
commit f987c67
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/crypto/BRCryptoWallet.c b/crypto/BRCryptoWallet.c
@@ -379,7 +379,8 @@ cryptoWalletGetDefaultFeeBasis (BRCryptoWallet wallet) {
             BRWallet *wid = wallet->u.btc.wid;
 
             assert (0); // TODO: Generic Size not 1000
-            feeBasis = cryptoFeeBasisCreateAsBTC (feeUnit, BRWalletFeePerKb (wid), 1000);
+            feeBasis = cryptoFeeBasisCreateAsBTC (feeUnit, (uint32_t) BRWalletFeePerKb (wid), 1000);
+            break;
         }
         case BLOCK_CHAIN_TYPE_ETH: {
             BREthereumEWM ewm = wallet->u.eth.ewm;
@@ -389,13 +390,15 @@ cryptoWalletGetDefaultFeeBasis (BRCryptoWallet wallet) {
             BREthereumGasPrice gasPrice = ewmWalletGetDefaultGasPrice (ewm, wid);
 
             feeBasis =  cryptoFeeBasisCreateAsETH (feeUnit, gas, gasPrice);
+            break;
         }
         case BLOCK_CHAIN_TYPE_GEN: {
             BRGenericWalletManager gwm = wallet->u.gen.gwm;
             BRGenericWallet wid = wallet->u.gen.wid;
 
             BRGenericFeeBasis bid = gwmWalletGetDefaultFeeBasis (gwm, wid);
             feeBasis =  cryptoFeeBasisCreateAsGEN (feeUnit, gwm, bid);
+            break;
         }
     }
 

diff --git a/crypto/BRCryptoWalletManager.c b/crypto/BRCryptoWalletManager.c
@@ -645,7 +645,8 @@ cryptoWalletManagerSubmit (BRCryptoWalletManager cwm,
                                      cryptoTransferAsGEN (transfer),
                                      seed);
 
-            seed = UINT512_ZERO;
+            seed = UINT512_ZERO; (void) &seed;
+
             break;
         }
     }

diff --git a/crypto/BRCryptoWalletManagerClient.c b/crypto/BRCryptoWalletManagerClient.c
@@ -758,6 +758,10 @@ cwmStateFromETH (BREthereumEWMState state) {
     }
 }
 
+#pragma clang diagnostic push
+#pragma GCC diagnostic push
+#pragma clang diagnostic ignored "-Wunused-function"
+#pragma GCC diagnostic ignored "-Wunused-function"
 static BREthereumEWMState
 cwmStateAsETH (BRCryptoWalletManagerState state) {
     switch (state) {
@@ -768,6 +772,8 @@ cwmStateAsETH (BRCryptoWalletManagerState state) {
         case CRYPTO_WALLET_MANAGER_STATE_DELETED:      return EWM_STATE_DELETED;
     }
 }
+#pragma clang diagnostic pop
+#pragma GCC diagnostic pop
 
 static void
 cwmWalletManagerEventAsETH (BREthereumClientContext context,
@@ -1148,7 +1154,7 @@ cwmTransactionEventAsETH (BREthereumClientContext context,
 
     // We'll transition from `oldState` to `newState`; get some placeholder values in place.
     BRCryptoTransferState oldState = { CRYPTO_TRANSFER_STATE_CREATED };
-    BRCryptoTransferState newState = { CRYPTO_TRANSFER_STATE_CREATED };
+    BRCryptoTransferState newState = { CRYPTO_TRANSFER_STATE_CREATED }; (void) &newState;
     if (NULL != transfer) oldState = cryptoTransferGetState (transfer);
 
     switch (event.type) {

diff --git a/ethereum/bcs/BREthereumBCS.c b/ethereum/bcs/BREthereumBCS.c
@@ -265,10 +265,11 @@ bcsCreate (BREthereumNetwork network,
         chainHeader = blockCheckpointCreatePartialBlockHeader(checkpoint);
     }
 
+#if defined (LES_DISABLE_DISCOVERY)
+    BREthereumBoolean discoverNodes = ETHEREUM_BOOLEAN_FALSE;
+#else
     // There is no need to discover nodes if we are in BRD_ONLY mode.
     BREthereumBoolean discoverNodes = AS_ETHEREUM_BOOLEAN (mode != SYNC_MODE_BRD_ONLY);
-#if defined (LES_DISABLE_DISCOVERY)
-    discoverNodes = ETHEREUM_BOOLEAN_FALSE;
 #endif
 
     BREthereumBoolean handleSync = AS_ETHEREUM_BOOLEAN (SYNC_MODE_P2P_ONLY == mode ||
-Original file line number
+Diff line change
@@ Expand Up / @@ -645,7 +645,8 @@ cryptoWalletManagerSubmit (BRCryptoWalletManager cwm, @@
                                          cryptoTransferAsGEN (transfer),
                                          seed);
-                seed = UINT512_ZERO;
+                seed = UINT512_ZERO; (void) &seed;
                 break;
             }
         }
@@ Expand Down @@