Changeset 4015Tweet

Timestamp:

Nov 23, 2009, 12:16:03 PM (13 years ago)

Author:

Sam Hocevar

Message:

Fix a compilation warning in the network code.

File:

• zzuf/trunk/src/network.c (modified) (2 diffs)

zzuf/trunk/src/network.c

@@ -197 +197 @@
 static unsigned int get_socket_ip(int sock)
 {
-    int ret;
+    struct sockaddr s;
     struct sockaddr_in sin;
     socklen_t len = sizeof(sin);
+    int ret;
 
     // Probably not a socket descriptor
@@ -205 +206 @@
         return 0;
 
-    memset(&sin, 0, sizeof(sin));
-    ret = getsockname(sock, &sin, &len);
-    if (ret) {
-        // TODO error handling
-        return 0;
-    }
-
+    /* Use a sockaddr instead of sockaddr_in because we don't know whether
+     * their alignments are compatible. So, no cast. */
+    memset(&s, 0, sizeof(sin));
+    ret = getsockname(sock, &s, &len);
+    if (ret)
+        return 0; // TODO: error handling
+
+    memcpy(&sin, &s, sizeof(sin));
     return sin.sin_addr.s_addr;
 }