Merge branch 'msvc-warnings' of https://github.com/svost/novacoin into svost-msvc...

diff --git a/src/keystore.h b/src/keystore.h
index 32d7783..96285fb 100644 (file)
--- a/src/keystore.h
+++ b/src/keystore.h
@@ -185,7 +185,6 @@ public:
                 return CBasicKeyStore::HaveKey(address);
             return mapCryptedKeys.count(address) > 0;
         }
-        return false;
     }
     bool GetKey(const CKeyID &address, CKey& keyOut) const;
     bool GetPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) const;

diff --git a/src/script.h b/src/script.h
index 157f41f..dfd2c19 100644 (file)
--- a/src/script.h
+++ b/src/script.h
@@ -447,7 +447,7 @@ public:
         // Immediate operand
         if (opcode <= OP_PUSHDATA4)
         {
-            uint32_t nSize;
+            uint32_t nSize = OP_0;
             if (opcode < OP_PUSHDATA1)
             {
                 nSize = opcode;
@@ -462,7 +462,6 @@ public:
             {
                 if (end() - pc < 2)
                     return false;
-                nSize = 0;
                 memcpy(&nSize, &pc[0], 2);
                 pc += 2;
             }