File namecoin-fixes.patch of Package namecoin

Overview Repositories Revisions Requests Users Attributes Meta

File namecoin-fixes.patch of Package namecoin

diff -rU3 namecoin-nc0.3.76.orig/src/keystore.cpp namecoin-nc0.3.76/src/keystore.cpp
--- namecoin-nc0.3.76.orig/src/keystore.cpp	2014-09-11 11:18:54.000000000 +0200
+++ namecoin-nc0.3.76/src/keystore.cpp	2014-09-13 10:42:13.000000000 +0200
@@ -103,8 +103,8 @@
                 return true;
             }
         }
-        return false;
     }
+    return false;
 }
 
 bool CKeyStore::SetCrypted()
@@ -129,8 +129,8 @@
         }
 
         fUseCrypto = true;
-        return true;
     }
+    return true;
 }
 
 bool CKeyStore::Lock()
diff -rU3 namecoin-nc0.3.76.orig/src/keystore.h namecoin-nc0.3.76/src/keystore.h
--- namecoin-nc0.3.76.orig/src/keystore.h	2014-09-11 11:18:54.000000000 +0200
+++ namecoin-nc0.3.76/src/keystore.h	2014-09-13 10:42:13.000000000 +0200
@@ -59,6 +59,7 @@
             else
                 return (mapKeys.count(vchPubKey) > 0);
         }
+	return false; // shouldn't happen, ever
     }
 
     virtual bool GetPrivKey(const std::vector<unsigned char> &vchPubKey, CPrivKey& keyOut) const;
diff -rU3 namecoin-nc0.3.76.orig/src/namecoin.cpp namecoin-nc0.3.76/src/namecoin.cpp
--- namecoin-nc0.3.76.orig/src/namecoin.cpp	2014-09-11 11:18:54.000000000 +0200
+++ namecoin-nc0.3.76/src/namecoin.cpp	2014-09-13 10:42:13.000000000 +0200
@@ -1441,8 +1441,8 @@
         printf("deletetransaction() : remove from pending");
         mapNamePending[vchName].erase(wtx.GetHash());
       }
-      return "success, please restart program to clear memory";
     }
+    return "success, please restart program to clear memory";
 }
 
 void rescanfornames()
@@ -1567,6 +1567,7 @@
         }
     }
     pcursor->close();
+    return true;
 }
 
 bool CNameDB::ScanNames(
@@ -1772,6 +1773,7 @@
             TxnCommit();
         }
     }
+    return true;
 }
 
 CHooks* InitHook()
diff -rU3 namecoin-nc0.3.76.orig/src/net.h namecoin-nc0.3.76/src/net.h
--- namecoin-nc0.3.76.orig/src/net.h	2014-09-11 11:18:54.000000000 +0200
+++ namecoin-nc0.3.76/src/net.h	2014-09-13 10:42:13.000000000 +0200
@@ -666,7 +666,7 @@
         // Make sure not to reuse time indexes to keep things in the same order
         int64 nNow = (GetTime() - 1) * 1000000;
         static int64 nLastTime;
-        nLastTime = nNow = std::max(nNow, ++nLastTime);
+        nLastTime = nNow = std::max(nNow, 1+nLastTime);
 
         // Each retry is 2 minutes after the last
         nRequestTime = std::max(nRequestTime + 2 * 60 * 1000000, nNow);
diff -rU3 namecoin-nc0.3.76.orig/src/qt/walletmodel.cpp namecoin-nc0.3.76/src/qt/walletmodel.cpp
--- namecoin-nc0.3.76.orig/src/qt/walletmodel.cpp	2014-09-11 11:18:54.000000000 +0200
+++ namecoin-nc0.3.76/src/qt/walletmodel.cpp	2014-09-13 10:47:38.000000000 +0200
@@ -736,6 +736,7 @@
         CWalletTx& wtxIn = wallet->mapWallet[wtxInHash];
         return QString::fromStdString(SendMoneyWithInputTx(scriptPubKey, MIN_AMOUNT, 0, wtxIn, wtx, true));
     }
+    return tr("This should never happen (walletmodel.cpp line 739)");
 }
 
 QString
diff -rU3 namecoin-nc0.3.76.orig/src/script.cpp namecoin-nc0.3.76/src/script.cpp
--- namecoin-nc0.3.76.orig/src/script.cpp	2014-09-11 11:18:54.000000000 +0200
+++ namecoin-nc0.3.76/src/script.cpp	2014-09-13 10:42:13.000000000 +0200
@@ -1118,6 +1118,7 @@
             return false;
         return keystore.HaveKey(mi->second);
     }
+    return false; // should never happen
 }
 
 // importaddress-friendly version of IsMine (ignores watch-only addresses)
@@ -1132,6 +1133,7 @@
             return false;
         return !vchPubKey.empty();
     }
+    return false; // should never happen
 }
 
 // importaddress-friendly version of IsMine (ignores watch-only addresses)
@@ -1146,6 +1148,7 @@
             return false;
         return !mi->second.empty() && keystore.HaveKey(mi->second);
     }
+    return false; // should never happen
 }
 
 bool ExtractPubKey(const CScript& scriptPubKey, const CKeyStore* keystore, vector<unsigned char>& vchPubKeyRet)

Places

File namecoin-fixes.patch of Package namecoin

Places