Merge pull request #1139 from pistacheio/no-memset

fix: drop memset() calls
pistacheio · Jun 27, 2023 · 17644dd · 17644dd
2 parents 63d5138 + 6d9a0af
commit 17644dd
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 28 deletions.
diff --git a/src/client/client.cc b/src/client/client.cc
@@ -534,12 +534,9 @@ namespace Pistache::Http::Experimental
 
     void Connection::connect(const Address& addr)
     {
-        struct addrinfo hints;
-        memset(&hints, 0, sizeof(struct addrinfo));
-        hints.ai_family   = addr.family();
-        hints.ai_socktype = SOCK_STREAM; /* Stream socket */
-        hints.ai_flags    = 0;
-        hints.ai_protocol = 0;
+        struct addrinfo hints = {};
+        hints.ai_family       = addr.family();
+        hints.ai_socktype     = SOCK_STREAM; /* Stream socket */
 
         const auto& host = addr.host();
         const auto& port = addr.port().toString();

diff --git a/src/common/mime.cc b/src/common/mime.cc
@@ -107,8 +107,7 @@ namespace Pistache::Http::Mime
         else if (val_ == 100)
             return "q=1";
 
-        char buff[sizeof("q=0.99")];
-        memset(buff, 0, sizeof buff);
+        char buff[sizeof("q=0.99")] = {};
         if (val_ % 10 == 0)
             snprintf(buff, sizeof buff, "q=%.1f", val_ / 100.0);
         else

diff --git a/src/common/net.cc b/src/common/net.cc
@@ -37,12 +37,9 @@ namespace Pistache
         {
             std::vector<std::string> result;
 
-            struct addrinfo hints;
-            memset(&hints, 0, sizeof(struct addrinfo));
-            hints.ai_family   = AF_INET;
-            hints.ai_socktype = SOCK_STREAM; /* Stream socket */
-            hints.ai_flags    = 0;
-            hints.ai_protocol = 0;
+            struct addrinfo hints = {};
+            hints.ai_family       = AF_INET;
+            hints.ai_socktype     = SOCK_STREAM; /* Stream socket */
 
             AddrInfo addressInfo;
 

diff --git a/src/server/listener.cc b/src/server/listener.cc
@@ -253,12 +253,10 @@ namespace Pistache::Tcp
     {
         addr_ = address;
 
-        struct addrinfo hints;
-        memset(&hints, 0, sizeof(struct addrinfo));
-        hints.ai_family   = address.family();
-        hints.ai_socktype = SOCK_STREAM;
-        hints.ai_flags    = AI_PASSIVE;
-        hints.ai_protocol = 0;
+        struct addrinfo hints = {};
+        hints.ai_family       = address.family();
+        hints.ai_socktype     = SOCK_STREAM;
+        hints.ai_flags        = AI_PASSIVE;
 
         const auto& host = addr_.host();
         const auto& port = addr_.port().toString();

diff --git a/tests/listener_test.cc b/tests/listener_test.cc
@@ -65,12 +65,11 @@ class DummyHandler : public Pistache::Http::Handler
 SocketWrapper bind_free_port()
 {
     int sockfd; // listen on sock_fd, new connection on new_fd
-    addrinfo hints, *servinfo, *p;
+    struct addrinfo hints = {}, *servinfo, *p;
 
     int yes = 1;
     int rv;
 
-    memset(&hints, 0, sizeof hints);
     hints.ai_family   = AF_UNSPEC;
     hints.ai_socktype = SOCK_STREAM;
     hints.ai_flags    = AI_PASSIVE; // use my IP

diff --git a/tests/tcp_client.h b/tests/tcp_client.h
@@ -34,12 +34,9 @@ namespace Pistache
     public:
         bool connect(const Pistache::Address& address)
         {
-            struct addrinfo hints;
-            std::memset(&hints, 0, sizeof(hints));
-            hints.ai_family   = address.family();
-            hints.ai_socktype = SOCK_STREAM;
-            hints.ai_flags    = 0;
-            hints.ai_protocol = 0;
+            struct addrinfo hints = {};
+            hints.ai_family       = address.family();
+            hints.ai_socktype     = SOCK_STREAM;
 
             auto host = address.host();
             auto port = address.port().toString();