(CFLAGS-tst-align.c): Add -mpreferred-stack-boundary=4.

[thirdparty/glibc.git] / sysdeps / mach / hurd / getpeername.c

diff --git a/sysdeps/mach/hurd/getpeername.c b/sysdeps/mach/hurd/getpeername.c
index 325b6fd75d50a33afb9ca13aa3b96efa6a949248..2e4f9f6a9d3ff336f35fb990ab4ba5fbd7aa72b3 100644 (file)
--- a/sysdeps/mach/hurd/getpeername.c
+++ b/sysdeps/mach/hurd/getpeername.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992,1994,1997,1999,2000,2005 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1994, 1997, 1999, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -47,22 +47,14 @@ __getpeername (int fd, __SOCKADDR_ARG addrarg, socklen_t *len)
 
   if (*len > buflen)
     *len = buflen;
-
+  
   if (buf != (char *) addr)
     {
       memcpy (addr, buf, *len);
       __vm_deallocate (__mach_task_self (), (vm_address_t) buf, buflen);
     }
 
-  const sa_family_t family = type;
-  if (*len > offsetof (struct sockaddr, sa_family))
-    {
-      if (*len < (char *) (&addr->sa_family + 1) - (char *) addr)
-       memcpy (&addr->sa_family, &family,
-               *len - offsetof (struct sockaddr, sa_family));
-      else
-       addr->sa_family = family;
-    }
+  addr->sa_family = type;
 
   return 0;
 }