diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 0769c94a89d..e0da2c88121 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1034,10 +1034,12 @@ get_server_config (const char *config_file, struct sockaddr_in *server,
       exit (EXIT_FAILURE);
     }
 
-  memset (server, 0, sizeof *server);
-  server->sin_family = AF_INET;
-  server->sin_addr.s_addr = inet_addr (dotted);
-  server->sin_port = htons (atoi (port));
+  *server = (struct sockaddr_in)
+    {
+      .sin_family = AF_INET,
+      .sin_addr.s_addr = inet_addr (dotted),
+      .sin_port = htons (atoi (port))
+    };
   free (dotted);
 
   if (! fread (authentication, AUTH_KEY_LENGTH, 1, config))