Merge remote-tracking branch 'upstream/develop' into action-wip

* upstream/develop: fix: change default send_queue_limit to 500 (4867) fix: clang warning about deprecated sprintf usage (4747)
ximinez · Jan 16, 2024 · 40d31ed · 40d31ed
2 parents dd17f0b + fe4d6c6
commit 40d31ed
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cfg/rippled-example.cfg b/cfg/rippled-example.cfg
@@ -1641,6 +1641,7 @@ port = 6006
 ip = 127.0.0.1
 admin = 127.0.0.1
 protocol = ws
+send_queue_limit = 500
 
 [port_grpc]
 port = 50051
@@ -1651,6 +1652,7 @@ secure_gateway = 127.0.0.1
 #port = 6005
 #ip = 127.0.0.1
 #protocol = wss
+#send_queue_limit = 500
 
 #-------------------------------------------------------------------------------
 

diff --git a/src/ripple/json/impl/json_reader.cpp b/src/ripple/json/impl/json_reader.cpp
@@ -922,10 +922,8 @@ Reader::getLocationLineAndColumn(Location location) const
 {
     int line, column;
     getLocationLineAndColumn(location, line, column);
-    constexpr std::size_t n = 18 + 16 + 16 + 1;
-    char buffer[n];
-    snprintf(buffer, n, "Line %d, Column %d", line, column);
-    return buffer;
+    return "Line " + std::to_string(line) + ", Column " +
+        std::to_string(column);
 }
 
 std::string