Merge bitcoin/bitcoin#26821: refactor: Make ThreadHTTP return void

achow101 · achow101 · commit 908212506dfc · 2023-01-11T16:46:45.000-05:00
45553e1 refactor: Make `ThreadHTTP` return void (Hennadii Stepanov) Pull request description: The `bool` return value was introduced in 755aa05 (bitcoin/bitcoin#8421). It has been not used since 8d3f46e (bitcoin/bitcoin#14670). No behavior change. ACKs for top commit: achow101: ACK 45553e1 brunoerg: crACK 45553e1 w0xlt: ACK bitcoin/bitcoin@45553e1 stickies-v: ACK 45553e1 Tree-SHA512: 1593a5740e729967fbe1363235cd5b77ecf431b29bc740a89a6c70fc838ad97a2e4a2cd7cd63aa482f7c50bc2ffabc8cd53e8f64d6032603cb3b662229bc3dc2
diff --git a/src/httpserver.cpp b/src/httpserver.cpp
@@ -279,15 +279,14 @@ static void http_reject_request_cb(struct evhttp_request* req, void*)
 }
 
 /** Event dispatcher thread */
-static bool ThreadHTTP(struct event_base* base)
+static void ThreadHTTP(struct event_base* base)
 {
     util::ThreadRename("http");
     SetSyscallSandboxPolicy(SyscallSandboxPolicy::NET_HTTP_SERVER);
     LogPrint(BCLog::HTTP, "Entering http event loop\n");
     event_base_dispatch(base);
     // Event loop will be interrupted by InterruptHTTPServer()
     LogPrint(BCLog::HTTP, "Exited http event loop\n");
-    return event_base_got_break(base) == 0;
 }
 
 /** Bind HTTP server to specified addresses */

Original file line number	Diff line number	Diff line change
`@@ -279,15 +279,14 @@ static void http_reject_request_cb(struct evhttp_request* req, void*)`
`279`	`279`	`}`
`280`	`280`
`281`	`281`	`/** Event dispatcher thread */`
`282`		`-static bool ThreadHTTP(struct event_base* base)`
	`282`	`+static void ThreadHTTP(struct event_base* base)`
`283`	`283`	`{`
`284`	`284`	`util::ThreadRename("http");`
`285`	`285`	`SetSyscallSandboxPolicy(SyscallSandboxPolicy::NET_HTTP_SERVER);`
`286`	`286`	`LogPrint(BCLog::HTTP, "Entering http event loop\n");`
`287`	`287`	`event_base_dispatch(base);`
`288`	`288`	`// Event loop will be interrupted by InterruptHTTPServer()`
`289`	`289`	`LogPrint(BCLog::HTTP, "Exited http event loop\n");`
`290`		`- return event_base_got_break(base) == 0;`
`291`	`290`	`}`
`292`	`291`
`293`	`292`	`/** Bind HTTP server to specified addresses */`