Fix more src lints

zeroc-ice · Jan 23, 2025 · 9476f5f · 9476f5f
1 parent 0fe7198
commit 9476f5f
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 11 deletions.
diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp
@@ -342,13 +342,15 @@ namespace
             CFRelease(error);
             return false;
         }
-        assert(decoder.get());
 
         data.reset(CFDataCreateWithBytesNoCopy(
             kCFAllocatorDefault,
             reinterpret_cast<const uint8_t*>(checksum.c_str()),
             static_cast<CFIndex>(checksum.size()),
             kCFAllocatorNull));
+
+        assert(decoder.get());
+        // NOLINTNEXTLINE(clang-analyzer-nullability.NullablePassedToNonnull)
         SecTransformSetAttribute(decoder.get(), kSecTransformInputAttributeName, data.get(), &error);
         if (error)
         {

diff --git a/cpp/src/Ice/HttpParser.cpp b/cpp/src/Ice/HttpParser.cpp
@@ -17,6 +17,8 @@ namespace
     {
         assert(begin);
         assert(end);
+
+        // NOLINTNEXTLINE(clang-analyzer-cplusplus.StringChecker)
         return string{reinterpret_cast<const char*>(begin), reinterpret_cast<const char*>(end)};
     }
 }

diff --git a/cpp/src/Ice/NetworkProxy.cpp b/cpp/src/Ice/NetworkProxy.cpp
@@ -15,7 +15,7 @@ namespace
     class SOCKSNetworkProxy final : public NetworkProxy
     {
     public:
-        SOCKSNetworkProxy(const string&, int);
+        SOCKSNetworkProxy(string, int);
         SOCKSNetworkProxy(const Address&);
 
         void beginWrite(const Address&, Buffer&) final;
@@ -37,7 +37,7 @@ namespace
     class HTTPNetworkProxy final : public NetworkProxy
     {
     public:
-        HTTPNetworkProxy(const string&, int);
+        HTTPNetworkProxy(string, int);
         HTTPNetworkProxy(const Address&, ProtocolSupport);
 
         void beginWrite(const Address&, Buffer&) final;
@@ -58,7 +58,10 @@ namespace
     };
 }
 
-SOCKSNetworkProxy::SOCKSNetworkProxy(const string& host, int port) : _host(host), _port(port) { assert(!host.empty()); }
+SOCKSNetworkProxy::SOCKSNetworkProxy(string host, int port) : _host(std::move(host)), _port(port)
+{
+    assert(!_host.empty());
+}
 
 SOCKSNetworkProxy::SOCKSNetworkProxy(const Address& addr) : _port(0), _address(addr) {}
 
@@ -168,9 +171,9 @@ SOCKSNetworkProxy::getProtocolSupport() const
     return EnableIPv4;
 }
 
-HTTPNetworkProxy::HTTPNetworkProxy(const string& host, int port) : _host(host), _port(port), _protocol(EnableBoth)
+HTTPNetworkProxy::HTTPNetworkProxy(string host, int port) : _host(std::move(host)), _port(port), _protocol(EnableBoth)
 {
-    assert(!host.empty());
+    assert(!_host.empty());
 }
 
 HTTPNetworkProxy::HTTPNetworkProxy(const Address& addr, ProtocolSupport protocol)

diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp
@@ -1631,10 +1631,10 @@ IceBoxHelper::print(const shared_ptr<Ice::Communicator>& communicator, Output& o
     printImpl(communicator, out, info);
     out << nl << "services";
     out << sb;
-    for (auto p = _desc->services.begin(); p != _desc->services.end(); ++p)
+    for (const auto& service : _desc->services)
     {
-        assert(p->descriptor);
-        out << nl << p->descriptor->name;
+        assert(server.descriptor);
+        out << nl << service.descriptor->name;
     }
     out << eb;
     out << eb;

diff --git a/cpp/src/IceStorm/Util.cpp b/cpp/src/IceStorm/Util.cpp
@@ -82,7 +82,7 @@ IceStormInternal::compareSubscriberRecordKey(const MDB_val* v1, const MDB_val* v
 IceStormElection::LogUpdate
 IceStormInternal::getIncrementedLLU(const IceDB::ReadWriteTxn& txn, LLUMap& lluMap)
 {
-    IceStormElection::LogUpdate llu;
+    IceStormElection::LogUpdate llu{0, 0};
     [[maybe_unused]] bool ok = lluMap.get(txn, lluDbKey, llu);
     assert(ok);
 

diff --git a/cpp/src/icegriddb/IceGridDB.cpp b/cpp/src/icegriddb/IceGridDB.cpp
@@ -168,7 +168,7 @@ run(const Ice::StringSeq& args)
     }
 
     string mapSizeStr = opts.optArg("mapsize");
-    size_t mapSize = IceDB::getMapSize(atoi(mapSizeStr.c_str()));
+    size_t mapSize = IceDB::getMapSize(stoi(mapSizeStr));
     string serverVersion = opts.optArg("server-version");
 
     try