Fix Coverity warnings

Signed-off-by: Raul Metsma <[email protected]>

Author: metsma

lib/libpcsc-cpp/tests/mock/test-byte-vector-string-operator.cpp

@@ -31,7 +31,7 @@ TEST(byte_vector_stringOperatorTest, appendsHexToNonEmptyString)
     byte_vector data = {0x12, 0x34, 0xAB, 0xFF};
     std::string prefix = "prefix-";
 
-    std::string result = prefix + data;
+    std::string result = std::move(prefix) + data;
 
     EXPECT_EQ(result, "prefix-1234abff");
 }
@@ -41,7 +41,7 @@ TEST(byte_vector_stringOperatorTest, appendsHexToEmptyString)
     byte_vector data = {0x01, 0xA0, 0xFF};
     std::string prefix;
 
-    std::string result = prefix + data;
+    std::string result = std::move(prefix) + data;
 
     EXPECT_EQ(result, "01a0ff");
 }
@@ -51,7 +51,7 @@ TEST(byte_vector_stringOperatorTest, handlesEmptyByteVector)
     byte_vector data;
     std::string prefix = "nothing-changes-";
 
-    std::string result = prefix + data;
+    std::string result = std::move(prefix) + data;
 
     EXPECT_EQ(result, "nothing-changes-");
 }

src/electronic-ids/pcsc/EIDThales.cpp

@@ -69,7 +69,7 @@ byte_vector EIDThales::getCertificateImpl(const SmartCard::Session& session,
 ElectronicID::PinInfo EIDThales::pinRetriesLeft(const SmartCard::Session& session,
                                                 byte_type pinReference, bool pinActive) const
 {
-    const auto GET_DATA = smartcard().protocol() == SmartCard::Protocol::T1
+    const auto& GET_DATA = smartcard().protocol() == SmartCard::Protocol::T1
         ? CommandApdu {0x00, 0xCB, 0x00, 0xFF, {0xA0, 0x03, 0x83, 0x01, pinReference}, 0x00}
         : CommandApdu {0x00, 0xCB, 0x00, 0xFF, {0xA0, 0x03, 0x83, 0x01, pinReference}};
     const auto response = session.transmit(GET_DATA);

src/electronic-ids/pcsc/LatEIDIDEMIAv2.cpp

@@ -117,7 +117,9 @@ TLV LatEIDIDEMIAV2::readEF_File(const SmartCard::Session& session, byte_vector f
     if (auto it = cache.find(file); it != cache.end()) {
         return TLV(it->second);
     }
-    return TLV(cache[std::move(file)] = readFile(session, CommandApdu::selectEF(0x02, file)));
+    auto value = readFile(session, CommandApdu::selectEF(0x02, file));
+    auto it = cache.try_emplace(std::move(file), std::move(value)).first;
+    return TLV(it->second);
 }
 
 TLV LatEIDIDEMIAV2::readDCODInfo(const SmartCard::Session& session, byte_type type,