From b7ed825b50674705e838311364957dedd076380d Mon Sep 17 00:00:00 2001
From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Fri, 12 Jan 2024 11:27:57 +0100
Subject: [PATCH] Fix typos in annotations: 1524912 COPY_INSTEAD_OF_MOVE and
 1524842 COPY_INSTEAD_OF_MOVE

---
 ext/yahttp/yahttp/router.hpp  | 2 +-
 pdns/recursordist/rec-main.cc | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ext/yahttp/yahttp/router.hpp b/ext/yahttp/yahttp/router.hpp
index be52f831b0..3cb13ed986 100644
--- a/ext/yahttp/yahttp/router.hpp
+++ b/ext/yahttp/yahttp/router.hpp
@@ -59,7 +59,7 @@ is consumed but not stored. Note that only path is matched, scheme, host and url
 /*! Map an URL.
 If method is left empty, it will match any method. Name is also optional, but needed if you want to find it for making URLs
 */
-    static void Map(const std::string& method, const std::string& url, THandlerFunction handler, const std::string& name = "") { router.map(method, std::move(url), handler, name); };
+    static void Map(const std::string& method, const std::string& url, THandlerFunction handler, const std::string& name = "") { router.map(method, url, std::move(handler), name); };
     static void Get(const std::string& url, THandlerFunction handler, const std::string& name = "") { router.map("GET", url, std::move(handler), name); }; //<! Helper for mapping GET
     static void Post(const std::string& url, THandlerFunction handler, const std::string& name = "") { router.map("POST", url, std::move(handler), name); }; //<! Helper for mapping POST
     static void Put(const std::string& url, THandlerFunction handler, const std::string& name = "") { router.map("PUT", url, std::move(handler), name); }; //<! Helper for mapping PUT
diff --git a/pdns/recursordist/rec-main.cc b/pdns/recursordist/rec-main.cc
index 173abc3ff2..a435f3a0d3 100644
--- a/pdns/recursordist/rec-main.cc
+++ b/pdns/recursordist/rec-main.cc
@@ -1348,13 +1348,13 @@ void parseACLs()
   }
 
   g_initialAllowFrom = allowFrom;
-  // coverity[copy_contructor_call] maybe this can be avoided, but be careful as pointers get passed to other threads
+  // coverity[copy_constructor_call] maybe this can be avoided, but be careful as pointers get passed to other threads
   broadcastFunction([=] { return pleaseSupplantAllowFrom(allowFrom); });
 
   auto allowNotifyFrom = parseACL("allow-notify-from-file", "allow-notify-from", log);
 
   g_initialAllowNotifyFrom = allowNotifyFrom;
-  // coverity[copy_contructor_call] maybe this can be avoided, but be careful as pointers get passed to other threads
+  // coverity[copy_constructor_call] maybe this can be avoided, but be careful as pointers get passed to other threads
   broadcastFunction([=] { return pleaseSupplantAllowNotifyFrom(allowNotifyFrom); });
 
   l_initialized = true;
-- 
2.47.2