Merge #10845: Remove unreachable code

Summary: 41bf1598f Remove unreachable code (practicalswift) Pull request description: Remove unreachable code. Tree-SHA512: 2ae94035f693b1ac73b1587eafcc646602a185f6d2b8a24a05939b43235b331c9e6f369ad2e8208624a47c920e989413c6a89ab9b608add5b7be4ebefae2a796 Backport of Core PR10845 bitcoin/bitcoin#10845 Test Plan: make check test_runner.py Reviewers: deadalnix, Fabien, jasonbcox, O1 Bitcoin ABC, #bitcoin_abc Reviewed By: jasonbcox, O1 Bitcoin ABC, #bitcoin_abc Differential Revision: https://reviews.bitcoinabc.org/D3658
devaultcrypto · Sep 6, 2019 · 0139fa0 · 0139fa0
1 parent 44def7f
commit 0139fa0
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 29 deletions.
diff --git a/src/rest.cpp b/src/rest.cpp
@@ -210,10 +210,6 @@ static bool rest_headers(Config &config, HTTPRequest *req,
                            "output format not found (available: .bin, .hex)");
         }
     }
-
-    // not reached
-    // continue to process further HTTP reqs on this cxn
-    return true;
 }
 
 static bool rest_block(const Config &config, HTTPRequest *req,
@@ -287,10 +283,6 @@ static bool rest_block(const Config &config, HTTPRequest *req,
                                AvailableDataFormatsString() + ")");
         }
     }
-
-    // not reached
-    // continue to process further HTTP reqs on this cxn
-    return true;
 }
 
 static bool rest_block_extended(Config &config, HTTPRequest *req,
@@ -327,10 +319,6 @@ static bool rest_chaininfo(Config &config, HTTPRequest *req,
                            "output format not found (available: json)");
         }
     }
-
-    // not reached
-    // continue to process further HTTP reqs on this cxn
-    return true;
 }
 
 static bool rest_mempool_info(Config &config, HTTPRequest *req,
@@ -356,10 +344,6 @@ static bool rest_mempool_info(Config &config, HTTPRequest *req,
                            "output format not found (available: json)");
         }
     }
-
-    // not reached
-    // continue to process further HTTP reqs on this cxn
-    return true;
 }
 
 static bool rest_mempool_contents(Config &config, HTTPRequest *req,
@@ -385,10 +369,6 @@ static bool rest_mempool_contents(Config &config, HTTPRequest *req,
                            "output format not found (available: json)");
         }
     }
-
-    // not reached
-    // continue to process further HTTP reqs on this cxn
-    return true;
 }
 
 static bool rest_tx(Config &config, HTTPRequest *req,
@@ -450,10 +430,6 @@ static bool rest_tx(Config &config, HTTPRequest *req,
                                AvailableDataFormatsString() + ")");
         }
     }
-
-    // not reached
-    // continue to process further HTTP reqs on this cxn
-    return true;
 }
 
 static bool rest_getutxos(Config &config, HTTPRequest *req,
@@ -670,10 +646,6 @@ static bool rest_getutxos(Config &config, HTTPRequest *req,
                                AvailableDataFormatsString() + ")");
         }
     }
-
-    // not reached
-    // continue to process further HTTP reqs on this cxn
-    return true;
 }
 
 static const struct {

diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
@@ -644,7 +644,6 @@ bool BerkeleyBatch::Rewrite(WalletDatabase &database, const char *pszSkip) {
         }
         MilliSleep(100);
     }
-    return false;
 }
 
 void BerkeleyEnvironment::Flush(bool fShutdown) {