From 5286000296ff0b57718fd8461764dea83495777f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Sat, 8 Mar 2008 17:44:39 +0000 Subject: [PATCH] Minor cleanup. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24309 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/network/socket.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/kits/network/socket.cpp b/src/kits/network/socket.cpp index 3e991d2b18..60925068f7 100644 --- a/src/kits/network/socket.cpp +++ b/src/kits/network/socket.cpp @@ -63,8 +63,8 @@ convert_from_r5_sockaddr(struct sockaddr *_to, const struct sockaddr *_from) const r5_sockaddr_in *from = (r5_sockaddr_in *)_from; sockaddr_in *to = (sockaddr_in *)_to; - memset(to, 0, sizeof(*to)); - to->sin_len = sizeof(*to); + memset(to, 0, sizeof(sockaddr)); + to->sin_len = sizeof(sockaddr); if (from == NULL) return; @@ -80,7 +80,8 @@ convert_from_r5_sockaddr(struct sockaddr *_to, const struct sockaddr *_from) static void -convert_to_r5_sockaddr(struct sockaddr *_to, const struct sockaddr *_from) +convert_to_r5_sockaddr(struct sockaddr *_to, + const struct sockaddr *_from) { const sockaddr_in *from = (sockaddr_in *)_from; r5_sockaddr_in *to = (r5_sockaddr_in *)_to; @@ -88,7 +89,8 @@ convert_to_r5_sockaddr(struct sockaddr *_to, const struct sockaddr *_from) if (to == NULL) return; - memset(to, 0, sizeof(*to)); + memset(to, 0, sizeof(r5_sockaddr_in)); + if (from->sin_family == AF_INET) to->sin_family = R5_AF_INET; else