Skip to content

Commit a377510

Browse files
author
MarcoFalke
committed
Merge bitcoin/bitcoin#23643: rpc: remove info about mallocinfo needing glibc 2.10+
9a09d30 rpc: remove info about mallocinfo needing glibc 2.10+ (fanquake) Pull request description: We require glibc 2.18+. ACKs for top commit: jarolrod: ACK 9a09d30 shaavan: ACK 9a09d30 Tree-SHA512: 61312e48fda4cb4c788d44be0f0c626e753b0a18a8f36bca813ce838f8e619e73c00306bb716e9863a077c09b5bcdec7dec134d75c5ace719a5c0a05cf75ed8a
2 parents df562d6 + 9a09d30 commit a377510

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/rpc/misc.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ static RPCHelpMan getmemoryinfo()
558558
#ifdef HAVE_MALLOC_INFO
559559
return RPCMallocInfo();
560560
#else
561-
throw JSONRPCError(RPC_INVALID_PARAMETER, "mallocinfo is only available when compiled with glibc 2.10+");
561+
throw JSONRPCError(RPC_INVALID_PARAMETER, "mallocinfo mode not available");
562562
#endif
563563
} else {
564564
throw JSONRPCError(RPC_INVALID_PARAMETER, "unknown mode " + mode);

test/functional/rpc_misc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def run_test(self):
5050
assert_equal(tree.tag, 'malloc')
5151
except JSONRPCException:
5252
self.log.info('getmemoryinfo(mode="mallocinfo") not available')
53-
assert_raises_rpc_error(-8, 'mallocinfo is only available when compiled with glibc 2.10+', node.getmemoryinfo, mode="mallocinfo")
53+
assert_raises_rpc_error(-8, 'mallocinfo mode not available', node.getmemoryinfo, mode="mallocinfo")
5454

5555
assert_raises_rpc_error(-8, "unknown mode foobar", node.getmemoryinfo, mode="foobar")
5656

0 commit comments

Comments
 (0)