From eaf9147fcda5f6e6f8b1ff78c12484d432af1028 Mon Sep 17 00:00:00 2001
From: Frank Lichtenheld <frank@lichtenheld.com>
Date: Wed, 10 Jan 2024 18:20:15 +0100
Subject: [PATCH] Add various moves as suggested by Coverity

Out of all the suggestions by Coverity I picked
the ones that move non-Ptr objects into variables
or attributes.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
---
 openvpn/client/cliopthelper.hpp    | 2 +-
 openvpn/client/cliproto.hpp        | 2 +-
 openvpn/common/jsonhelper.hpp      | 2 +-
 openvpn/common/options.hpp         | 4 ++--
 openvpn/crypto/static_key.hpp      | 2 +-
 openvpn/netconf/linux/gw.hpp       | 2 +-
 openvpn/options/merge.hpp          | 2 +-
 openvpn/ssl/psid_cookie_impl.hpp   | 2 +-
 openvpn/tun/linux/client/sitnl.hpp | 4 ++--
 test/unittests/test_helper.hpp     | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/openvpn/client/cliopthelper.hpp b/openvpn/client/cliopthelper.hpp
index 1b9c0249c..743e25843 100644
--- a/openvpn/client/cliopthelper.hpp
+++ b/openvpn/client/cliopthelper.hpp
@@ -284,7 +284,7 @@ class ParseClientConfig
                 if (options.exists("push-peer-info"))
                     pushPeerInfo_ = true;
                 if (pushPeerInfo_)
-                    peerInfoUV_ = peer_info_uv;
+                    peerInfoUV_ = std::move(peer_info_uv);
             }
 
             // dev name
diff --git a/openvpn/client/cliproto.hpp b/openvpn/client/cliproto.hpp
index 938dff193..faf167237 100644
--- a/openvpn/client/cliproto.hpp
+++ b/openvpn/client/cliproto.hpp
@@ -715,7 +715,7 @@ class Session : ProtoContext,
         else
         {
             fatal_ = Error::AUTH_FAILED;
-            fatal_reason_ = reason;
+            fatal_reason_ = std::move(reason);
             log_reason = "AUTH_FAILED";
         }
         if (notify_callback)
diff --git a/openvpn/common/jsonhelper.hpp b/openvpn/common/jsonhelper.hpp
index 891d30d8e..3a24ac642 100644
--- a/openvpn/common/jsonhelper.hpp
+++ b/openvpn/common/jsonhelper.hpp
@@ -164,7 +164,7 @@ inline void from_vector(Json::Value &root, const T &vec, const NAME &name)
     for (auto &e : vec)
         array.append(e.to_json());
     if (array.size())
-        root[name] = array;
+        root[name] = std::move(array);
 }
 
 template <typename TITLE>
diff --git a/openvpn/common/options.hpp b/openvpn/common/options.hpp
index 9e53c50f0..65aaefe58 100644
--- a/openvpn/common/options.hpp
+++ b/openvpn/common/options.hpp
@@ -1049,7 +1049,7 @@ class OptionList : public std::vector<Option>, public RCCopyable<thread_unsafe_r
                             extraneous_err(line_num, "option", opt);
                         untag_open_tag(opt.ref(0));
                         opt.push_back("");
-                        multiline = opt;
+                        multiline = std::move(opt);
                         in_multiline = true;
                     }
                     else
@@ -1117,7 +1117,7 @@ class OptionList : public std::vector<Option>, public RCCopyable<thread_unsafe_r
                                 extraneous_err(line_num, "meta option", opt);
                             untag_open_meta_tag(opt.ref(0));
                             opt.push_back("");
-                            multiline = opt;
+                            multiline = std::move(opt);
                             in_multiline = true;
                         }
                         else
diff --git a/openvpn/crypto/static_key.hpp b/openvpn/crypto/static_key.hpp
index b8e995c9e..4212957ab 100644
--- a/openvpn/crypto/static_key.hpp
+++ b/openvpn/crypto/static_key.hpp
@@ -165,7 +165,7 @@ class OpenVPNStaticKey
         }
         if (in_body || data.size() != KEY_SIZE)
             throw static_key_parse_error();
-        key_data_ = data;
+        key_data_ = std::move(data);
     }
 
     std::string render() const
diff --git a/openvpn/netconf/linux/gw.hpp b/openvpn/netconf/linux/gw.hpp
index 17455da0a..cef601d97 100644
--- a/openvpn/netconf/linux/gw.hpp
+++ b/openvpn/netconf/linux/gw.hpp
@@ -109,7 +109,7 @@ class LinuxGW
                 if (m < best_metric || best_metric == std::numeric_limits<int>::max())
                 {
                     best_metric = m;
-                    dev_ = d;
+                    dev_ = std::move(d);
                     addr_ = a;
                 }
             }
diff --git a/openvpn/options/merge.hpp b/openvpn/options/merge.hpp
index f95814c43..dca252758 100644
--- a/openvpn/options/merge.hpp
+++ b/openvpn/options/merge.hpp
@@ -268,7 +268,7 @@ class ProfileMerge
                     if (OptionList::is_open_tag(opt.ref(0)) && opt.size() == 1)
                     {
                         OptionList::untag_open_tag(opt.ref(0));
-                        multiline = opt;
+                        multiline = std::move(opt);
                         in_multiline = true;
                         unsigned int flags = 0; // not used
                         opaque_multiline = is_fileref_directive(multiline.ref(0), flags);
diff --git a/openvpn/ssl/psid_cookie_impl.hpp b/openvpn/ssl/psid_cookie_impl.hpp
index 74dce060c..e15389a6d 100644
--- a/openvpn/ssl/psid_cookie_impl.hpp
+++ b/openvpn/ssl/psid_cookie_impl.hpp
@@ -131,7 +131,7 @@ class PsidCookieImpl : public PsidCookie
 
     virtual void provide_psid_cookie_transport(PsidCookieTransportBase::Ptr pctb) override
     {
-        pctb_ = pctb;
+        pctb_ = std::move(pctb);
     }
 
 #ifndef UNIT_TEST
diff --git a/openvpn/tun/linux/client/sitnl.hpp b/openvpn/tun/linux/client/sitnl.hpp
index 708947e83..5a9ae9770 100644
--- a/openvpn/tun/linux/client/sitnl.hpp
+++ b/openvpn/tun/linux/client/sitnl.hpp
@@ -693,8 +693,8 @@ class SITNL
 
         if (!res->route.defined() && save.ifa_index == res->ifindex)
         {
-            res->route = route;
-            OPENVPN_LOG_RTNL(__func__ << ": MATCH " << route.to_string() << " ifindex=" << save.ifa_index);
+            res->route = std::move(route);
+            OPENVPN_LOG_RTNL(__func__ << ": MATCH " << res->route.to_string() << " ifindex=" << save.ifa_index);
         }
         return 0;
     }
diff --git a/test/unittests/test_helper.hpp b/test/unittests/test_helper.hpp
index e66696d98..19283b764 100644
--- a/test/unittests/test_helper.hpp
+++ b/test/unittests/test_helper.hpp
@@ -303,7 +303,7 @@ class FakeAsyncResolvable : public RESOLVABLE
             EndpointType ep(openvpn_io::ip::make_address(result.first), result.second);
             endpoints.push_back(ep);
         }
-        results_[host + ":" + service] = endpoints;
+        results_[host + ":" + service] = std::move(endpoints);
     }
 
     FakeAsyncResolvable(CTOR_ARGS... args)