Remove redundant `struct` keys

Because this is C++ code, GCC 12 says things like:

    Socket.hpp:166:24: error:
    redundant class-key ‘struct’ in reference to ‘struct sockaddr_un’
    [-Werror=redundant-tags]

4 files changed, 21 insertions, 27 deletions

diff --git a/include/raul/Process.hpp b/include/raul/Process.hpp
index 085ed8b..d3ef0a9 100644
--- a/include/raul/Process.hpp
+++ b/include/raul/Process.hpp
@@ -46,7 +46,7 @@ public:
       // (in child)
 
       // Close all nonstandard file descriptors
-      struct rlimit max_fds {};
+      rlimit max_fds {};
       getrlimit(RLIMIT_NOFILE, &max_fds);
       for (rlim_t fd = 3; fd < max_fds.rlim_cur; ++fd) {
         close(static_cast<int>(fd));
diff --git a/include/raul/Semaphore.hpp b/include/raul/Semaphore.hpp
index f4dc447..a30737b 100644
--- a/include/raul/Semaphore.hpp
+++ b/include/raul/Semaphore.hpp
@@ -256,7 +256,7 @@ Semaphore::timed_wait(const std::chrono::duration<Rep, Period>& wait)
   namespace chr = std::chrono;
 
   // Use clock_gettime to ensure sem_timedwait uses the same clock
-  struct timespec time {};
+  timespec time{};
   clock_gettime(CLOCK_REALTIME, &time);
 
   const auto now(chr::seconds(time.tv_sec) + chr::nanoseconds(time.tv_nsec));
@@ -265,8 +265,8 @@ Semaphore::timed_wait(const std::chrono::duration<Rep, Period>& wait)
   const chr::seconds end_sec(chr::duration_cast<chr::seconds>(end));
   const chr::nanoseconds end_nsec(end - end_sec);
 
-  const struct timespec ts_end = {static_cast<time_t>(end_sec.count()),
-                                  static_cast<long>(end_nsec.count())};
+  const timespec ts_end = {static_cast<time_t>(end_sec.count()),
+                           static_cast<long>(end_nsec.count())};
 
   return (sem_timedwait(&_sem, &ts_end) == 0);
 }
diff --git a/include/raul/Socket.hpp b/include/raul/Socket.hpp
index 6a2883c..d73cf69 100644
--- a/include/raul/Socket.hpp
+++ b/include/raul/Socket.hpp
@@ -45,11 +45,7 @@ public:
   explicit Socket(Type t);
 
   /// Wrap an existing open socket
-  Socket(Type             t,
-         std::string      uri,
-         struct sockaddr* addr,
-         socklen_t        addr_len,
-         int              fd);
+  Socket(Type t, std::string uri, sockaddr* addr, socklen_t addr_len, int fd);
 
   Socket(const Socket&) = delete;
   Socket& operator=(const Socket&) = delete;
@@ -110,11 +106,11 @@ public:
 private:
   bool set_addr(const std::string& uri);
 
-  std::string      _uri;
-  struct sockaddr* _addr;
-  socklen_t        _addr_len;
-  Type             _type;
-  int              _sock;
+  std::string _uri;
+  sockaddr*   _addr;
+  socklen_t   _addr_len;
+  Type        _type;
+  int         _sock;
 };
 
 #ifndef NI_MAXHOST
@@ -138,11 +134,11 @@ inline Socket::Socket(Type t)
   }
 }
 
-inline Socket::Socket(Type             t,
-                      std::string      uri,
-                      struct sockaddr* addr,
-                      socklen_t        addr_len,
-                      int              fd)
+inline Socket::Socket(Type        t,
+                      std::string uri,
+                      sockaddr*   addr,
+                      socklen_t   addr_len,
+                      int         fd)
   : _uri(std::move(uri))
   , _addr(addr)
   , _addr_len(addr_len)
@@ -162,13 +158,12 @@ Socket::set_addr(const std::string& uri)
   free(_addr);
   if (_type == Type::UNIX && uri.substr(0, strlen("unix://")) == "unix://") {
     const std::string path = uri.substr(strlen("unix://"));
-    auto*             uaddr =
-      static_cast<struct sockaddr_un*>(calloc(1, sizeof(struct sockaddr_un)));
+    auto* uaddr = static_cast<sockaddr_un*>(calloc(1, sizeof(sockaddr_un)));
     uaddr->sun_family = AF_UNIX;
     strncpy(uaddr->sun_path, path.c_str(), sizeof(uaddr->sun_path) - 1);
     _uri      = uri;
     _addr     = reinterpret_cast<sockaddr*>(uaddr);
-    _addr_len = sizeof(struct sockaddr_un);
+    _addr_len = sizeof(sockaddr_un);
     return true;
   }
 
@@ -185,13 +180,13 @@ Socket::set_addr(const std::string& uri)
       host = "0.0.0.0"; // INADDR_ANY
     }
 
-    struct addrinfo* ainfo = nullptr;
+    addrinfo* ainfo = nullptr;
     if (getaddrinfo(host.c_str(), port.c_str(), nullptr, &ainfo)) {
       return false;
     }
 
     _uri      = uri;
-    _addr     = static_cast<struct sockaddr*>(malloc(ainfo->ai_addrlen));
+    _addr     = static_cast<sockaddr*>(malloc(ainfo->ai_addrlen));
     _addr_len = ainfo->ai_addrlen;
     memcpy(_addr, ainfo->ai_addr, ainfo->ai_addrlen);
     freeaddrinfo(ainfo);
@@ -223,8 +218,7 @@ inline std::shared_ptr<Socket>
 Socket::accept()
 {
   socklen_t   client_addr_len = _addr_len;
-  auto* const client_addr =
-    static_cast<struct sockaddr*>(calloc(1, client_addr_len));
+  auto* const client_addr = static_cast<sockaddr*>(calloc(1, client_addr_len));
 
   const int conn = ::accept(_sock, client_addr, &client_addr_len);
   if (conn == -1) {
diff --git a/test/socket_test.cpp b/test/socket_test.cpp
index 964a8ae..da05c40 100644
--- a/test/socket_test.cpp
+++ b/test/socket_test.cpp
@@ -47,7 +47,7 @@ main()
     int status = 0;
     waitpid(child_pid, &status, 0);
 
-    struct pollfd pfds[2];
+    pollfd pfds[2];
     pfds[0].fd      = unix_server_sock.fd();
     pfds[0].events  = POLLIN;
     pfds[0].revents = 0;