From 80a71975905941307f6521bb24d2eb1be454d321 Mon Sep 17 00:00:00 2001 From: Denis Angell Date: Wed, 30 Apr 2025 11:51:58 +0200 Subject: [PATCH] fix warnings (#505) --- src/ripple/app/misc/NetworkOPs.cpp | 6 +++--- src/ripple/app/misc/SHAMapStoreImp.cpp | 2 -- src/ripple/app/rdb/backend/FlatmapDatabase.h | 4 +--- src/ripple/app/rdb/backend/RWDBDatabase.h | 1 - src/ripple/app/tx/impl/Escrow.cpp | 8 ++++---- src/ripple/json/impl/json_reader.cpp | 5 ++--- src/ripple/net/HTTPClient.h | 4 ++++ src/ripple/overlay/impl/Handshake.cpp | 2 ++ src/ripple/protocol/impl/PublicKey.cpp | 1 + src/ripple/rpc/impl/ServerHandlerImp.cpp | 5 ----- src/test/app/SetHook_test.cpp | 1 - src/test/jtx/TrustedPublisherServer.h | 2 +- src/test/rpc/AccountNamespace_test.cpp | 16 ---------------- 13 files changed, 18 insertions(+), 39 deletions(-) diff --git a/src/ripple/app/misc/NetworkOPs.cpp b/src/ripple/app/misc/NetworkOPs.cpp index 6db57fda1..0e5b8ef5f 100644 --- a/src/ripple/app/misc/NetworkOPs.cpp +++ b/src/ripple/app/misc/NetworkOPs.cpp @@ -199,7 +199,7 @@ public: strOperatingMode(bool const admin = false) const override; StateAccounting::CounterData - getStateAccountingData(); + getStateAccountingData() override; // // Transaction operations. @@ -711,10 +711,10 @@ private: std::mutex validationsMutex_; RCLConsensus& - getConsensus(); + getConsensus() override; LedgerMaster& - getLedgerMaster(); + getLedgerMaster() override; private: struct Stats diff --git a/src/ripple/app/misc/SHAMapStoreImp.cpp b/src/ripple/app/misc/SHAMapStoreImp.cpp index 1fd8ed1e6..acfa41122 100644 --- a/src/ripple/app/misc/SHAMapStoreImp.cpp +++ b/src/ripple/app/misc/SHAMapStoreImp.cpp @@ -296,8 +296,6 @@ SHAMapStoreImp::run() fullBelowCache_ = &(*app_.getNodeFamily().getFullBelowCache(0)); treeNodeCache_ = &(*app_.getNodeFamily().getTreeNodeCache(0)); - bool const isMem = app_.config().mem_backend(); - if (advisoryDelete_) canDelete_ = state_db_.getCanDelete(); diff --git a/src/ripple/app/rdb/backend/FlatmapDatabase.h b/src/ripple/app/rdb/backend/FlatmapDatabase.h index 34814655f..00927b1d4 100644 --- a/src/ripple/app/rdb/backend/FlatmapDatabase.h +++ b/src/ripple/app/rdb/backend/FlatmapDatabase.h @@ -52,8 +52,6 @@ private: }; Application& app_; - Config const& config_; - JobQueue& jobQueue_; boost::unordered::concurrent_flat_map ledgers_; boost::unordered:: @@ -67,7 +65,7 @@ private: public: FlatmapDatabase(Application& app, Config const& config, JobQueue& jobQueue) - : app_(app), config_(config), jobQueue_(jobQueue) + : app_(app) { } diff --git a/src/ripple/app/rdb/backend/RWDBDatabase.h b/src/ripple/app/rdb/backend/RWDBDatabase.h index 9c6d70e7e..3981691bc 100644 --- a/src/ripple/app/rdb/backend/RWDBDatabase.h +++ b/src/ripple/app/rdb/backend/RWDBDatabase.h @@ -794,7 +794,6 @@ public: // reached before the result set has been exhausted (we always query for // one more than the limit), then we return an opaque marker that can be // supplied in a subsequent query. - std::uint32_t queryLimit = numberOfResults + 1; std::uint32_t findLedger = 0, findSeq = 0; if (lookingForMarker) diff --git a/src/ripple/app/tx/impl/Escrow.cpp b/src/ripple/app/tx/impl/Escrow.cpp index 74ee09a1a..552a0ebaa 100644 --- a/src/ripple/app/tx/impl/Escrow.cpp +++ b/src/ripple/app/tx/impl/Escrow.cpp @@ -446,8 +446,8 @@ EscrowFinish::preflight(PreflightContext const& ctx) { if ((!ctx.tx.isFieldPresent(sfEscrowID) && !ctx.tx.isFieldPresent(sfOfferSequence)) || - ctx.tx.isFieldPresent(sfEscrowID) && - ctx.tx.isFieldPresent(sfOfferSequence)) + (ctx.tx.isFieldPresent(sfEscrowID) && + ctx.tx.isFieldPresent(sfOfferSequence))) return temMALFORMED; } @@ -729,8 +729,8 @@ EscrowCancel::preflight(PreflightContext const& ctx) { if ((!ctx.tx.isFieldPresent(sfEscrowID) && !ctx.tx.isFieldPresent(sfOfferSequence)) || - ctx.tx.isFieldPresent(sfEscrowID) && - ctx.tx.isFieldPresent(sfOfferSequence)) + (ctx.tx.isFieldPresent(sfEscrowID) && + ctx.tx.isFieldPresent(sfOfferSequence))) return temMALFORMED; } diff --git a/src/ripple/json/impl/json_reader.cpp b/src/ripple/json/impl/json_reader.cpp index c92bea6d7..dd2f9a694 100644 --- a/src/ripple/json/impl/json_reader.cpp +++ b/src/ripple/json/impl/json_reader.cpp @@ -924,9 +924,8 @@ Reader::getLocationLineAndColumn(Location location) const { int line, column; getLocationLineAndColumn(location, line, column); - char buffer[18 + 16 + 16 + 1]; - sprintf(buffer, "Line %d, Column %d", line, column); - return buffer; + return "Line " + std::to_string(line) + ", Column " + + std::to_string(column); } std::string diff --git a/src/ripple/net/HTTPClient.h b/src/ripple/net/HTTPClient.h index 8cadc84bc..f133e3ee0 100644 --- a/src/ripple/net/HTTPClient.h +++ b/src/ripple/net/HTTPClient.h @@ -24,7 +24,11 @@ #include #include #include + #include +#include +#include +#include namespace ripple { diff --git a/src/ripple/overlay/impl/Handshake.cpp b/src/ripple/overlay/impl/Handshake.cpp index 937570888..11b75e28d 100644 --- a/src/ripple/overlay/impl/Handshake.cpp +++ b/src/ripple/overlay/impl/Handshake.cpp @@ -25,7 +25,9 @@ #include #include #include + #include + #include #include diff --git a/src/ripple/protocol/impl/PublicKey.cpp b/src/ripple/protocol/impl/PublicKey.cpp index ac86634f1..42ff1c68d 100644 --- a/src/ripple/protocol/impl/PublicKey.cpp +++ b/src/ripple/protocol/impl/PublicKey.cpp @@ -24,6 +24,7 @@ #include #include #include +#include namespace ripple { diff --git a/src/ripple/rpc/impl/ServerHandlerImp.cpp b/src/ripple/rpc/impl/ServerHandlerImp.cpp index c4e41fa27..5c9f43538 100644 --- a/src/ripple/rpc/impl/ServerHandlerImp.cpp +++ b/src/ripple/rpc/impl/ServerHandlerImp.cpp @@ -499,11 +499,6 @@ ServerHandlerImp::processUDP( return jr; } - auto required = RPC::roleRequired( - apiVersion, - app_.config().BETA_RPC_API, - jv.isMember(jss::command) ? jv[jss::command].asString() - : jv[jss::method].asString()); if (Role::FORBID == role) { jr[jss::result] = rpcError(rpcFORBIDDEN); diff --git a/src/test/app/SetHook_test.cpp b/src/test/app/SetHook_test.cpp index e122616e6..7f94b62fd 100644 --- a/src/test/app/SetHook_test.cpp +++ b/src/test/app/SetHook_test.cpp @@ -1110,7 +1110,6 @@ public: env.fund(XRP(10000000), bob); auto const preHookCount = (*env.le(alice))[sfHookStateCount]; - auto const preOwnerCount = (*env.le(alice))[sfOwnerCount]; std::string hook = "0061736D01000000012A0660057F7F7F7F7F017E60027F7F017E60027F7F017F60" diff --git a/src/test/jtx/TrustedPublisherServer.h b/src/test/jtx/TrustedPublisherServer.h index 266f8d922..64be52185 100644 --- a/src/test/jtx/TrustedPublisherServer.h +++ b/src/test/jtx/TrustedPublisherServer.h @@ -643,7 +643,7 @@ private: auto const sleep_sec = boost::lexical_cast(path.substr(7)); std::this_thread::sleep_for( - std::chrono::seconds{sleep_sec}); + std::chrono::seconds(sleep_sec)); } else if (boost::starts_with(path, "/redirect")) { diff --git a/src/test/rpc/AccountNamespace_test.cpp b/src/test/rpc/AccountNamespace_test.cpp index b63b52e68..aeeb04049 100644 --- a/src/test/rpc/AccountNamespace_test.cpp +++ b/src/test/rpc/AccountNamespace_test.cpp @@ -110,14 +110,6 @@ public: } // test errors on marker { - auto const key = uint256::fromVoid( - (std::array{ - 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, - 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, - 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, - 0x00U, 0x00U, 0x00U, 0x00U, 'k', 'e', 'y', 0x00U}) - .data()); - auto const ns = uint256::fromVoid( (std::array{ 0xCAU, 0xFEU, 0xCAU, 0xFEU, 0xCAU, 0xFEU, 0xCAU, 0xFEU, @@ -126,14 +118,6 @@ public: 0xCAU, 0xFEU, 0xCAU, 0xFEU, 0xCAU, 0xFEU, 0xCAU, 0xFEU}) .data()); - auto const nons = uint256::fromVoid( - (std::array{ - 0xCAU, 0xFEU, 0xCAU, 0xFEU, 0xCAU, 0xFEU, 0xCAU, 0xFEU, - 0xCAU, 0xFEU, 0xCAU, 0xFEU, 0xCAU, 0xFEU, 0xCAU, 0xFEU, - 0xCAU, 0xFEU, 0xCAU, 0xFEU, 0xCAU, 0xFEU, 0xCAU, 0xFEU, - 0xCAU, 0xFEU, 0xCAU, 0xFEU, 0xCAU, 0xFEU, 0xCAU, 0xFFU}) - .data()); - // Lambda to create a hook. auto setHook = [](test::jtx::Account const& account) { std::string const createCodeHex =