From 93c4652a0578cb2cf0363410617392a405b534d4 Mon Sep 17 00:00:00 2001 From: Andrew Chow Date: Wed, 11 Jan 2023 16:39:08 -0500 Subject: [PATCH] Merge bitcoin/bitcoin#26821: refactor: Make `ThreadHTTP` return void 45553e11c965db218733f9ad32ecde391b393443 refactor: Make `ThreadHTTP` return void (Hennadii Stepanov) Pull request description: The `bool` return value was introduced in 755aa05174e06effd758eeb78c5af9fb465e9611 (https://github.com/bitcoin/bitcoin/pull/8421). It has been not used since 8d3f46ec3938e2ba17654fecacd1d2629f9915fd (https://github.com/bitcoin/bitcoin/pull/14670). No behavior change. ACKs for top commit: achow101: ACK 45553e11c965db218733f9ad32ecde391b393443 brunoerg: crACK 45553e11c965db218733f9ad32ecde391b393443 w0xlt: ACK https://github.com/bitcoin/bitcoin/pull/26821/commits/45553e11c965db218733f9ad32ecde391b393443 stickies-v: ACK 45553e11c Tree-SHA512: 1593a5740e729967fbe1363235cd5b77ecf431b29bc740a89a6c70fc838ad97a2e4a2cd7cd63aa482f7c50bc2ffabc8cd53e8f64d6032603cb3b662229bc3dc2 --- src/httpserver.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/httpserver.cpp b/src/httpserver.cpp index a7dc2cfaa7..1d11955d38 100644 --- a/src/httpserver.cpp +++ b/src/httpserver.cpp @@ -315,14 +315,13 @@ 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"); 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 */