Lint

Author: cataphract

appsec/src/helper/main.cpp

@@ -98,7 +98,7 @@ bool ensure_unique_abstract_socket(std::string_view socket_path)
 
     // Try to connect to the socket. If successful, another helper is running
     // NOLINTNEXTLINE(android-cloexec-socket)
-    int sock = ::socket(AF_UNIX, SOCK_STREAM, 0);
+    int const sock = ::socket(AF_UNIX, SOCK_STREAM, 0);
     if (sock == -1) {
         SPDLOG_INFO("Failed to create test socket: errno {}", errno);
         return false;
@@ -114,7 +114,7 @@ bool ensure_unique_abstract_socket(std::string_view socket_path)
     // NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-constant-array-index)
     addr.sun_path[size + 1] = '\0';
 
-    int res = ::connect(
+    int const res = ::connect(
         // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
         sock, reinterpret_cast<struct sockaddr *>(&addr), sizeof(addr));
     ::close(sock);

appsec/src/helper/network/acceptor.cpp

@@ -31,7 +31,7 @@ acceptor::acceptor(const std::string_view &sv)
     struct sockaddr_un addr {};
     std::size_t addr_size;
     addr.sun_family = AF_UNIX;
-    bool is_abstract = (!sv.empty() && sv[0] == '@');
+    bool const is_abstract = (!sv.empty() && sv[0] == '@');
 
     if (is_abstract) {
 #ifdef __linux__
@@ -57,18 +57,17 @@ acceptor::acceptor(const std::string_view &sv)
         addr_size = sizeof(addr);
 
         // Remove the existing socket
-        int res = ::unlink(static_cast<char *>(addr.sun_path));
+        int const res = ::unlink(static_cast<char *>(addr.sun_path));
         if (res == -1 && errno != ENOENT) {
             SPDLOG_ERROR("Failed to unlink {}: errno {}", addr.sun_path, errno);
             throw std::system_error(errno, std::generic_category());
         }
         SPDLOG_DEBUG("Unlinked {}", addr.sun_path);
     }
 
-    int res =
+    int res = ::bind(
         // NOLINTNEXTLINE
-        ::bind(
-            sock_.get(), reinterpret_cast<struct sockaddr *>(&addr), addr_size);
+        sock_.get(), reinterpret_cast<struct sockaddr *>(&addr), addr_size);
     if (res == -1) {
         if (is_abstract) {
             SPDLOG_ERROR("Failed to bind abstract socket: errno {}", errno);