Merge latest Disobedience changes

[disorder] / lib / client-common.c

diff --git a/lib/client-common.c b/lib/client-common.c
index d2691298de514819372416353aa76063001860d8..53da8acc66899da0287e19a9280de85188e6c7a2 100644 (file)
--- a/lib/client-common.c
+++ b/lib/client-common.c
@@ -18,14 +18,10 @@
  * USA
  */
 
-#include <config.h>
-#include "types.h"
+#include "common.h"
 
-#include <sys/types.h>
-#include <sys/socket.h>
 #include <netinet/in.h>
 #include <sys/un.h>
-#include <string.h>
 #include <errno.h>
 #include <netdb.h>
 
@@ -48,14 +44,10 @@ socklen_t find_server(struct sockaddr **sap, char **namep) {
   socklen_t len;
    
   static const struct addrinfo pref = {
-    0,
-    PF_INET,
-    SOCK_STREAM,
-    IPPROTO_TCP,
-    0,
-    0,
-    0,
-    0
+    .ai_flags = 0,
+    .ai_family = PF_INET,
+    .ai_socktype = SOCK_STREAM,
+    .ai_protocol = IPPROTO_TCP,
   };
 
   if(config->connect.n) {