Prefer https to http for gnu.org and fsf.org URLs

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

diff --git a/sysdeps/mach/hurd/getsockopt.c b/sysdeps/mach/hurd/getsockopt.c
index 36403543df998af7c2e1dc6687b21930803ac8f4..a2ac8da38f902da6d528fcbdf1cca9ba3cc3b800 100644 (file)
--- a/sysdeps/mach/hurd/getsockopt.c
+++ b/sysdeps/mach/hurd/getsockopt.c
@@ -1,20 +1,19 @@
-/* Copyright (C) 1992, 1994, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1992-2019 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
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    The GNU C Library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <sys/socket.h>
@@ -29,12 +28,11 @@
 
 /* XXX should be __getsockopt ? */
 int
-getsockopt (fd, level, optname, optval, optlen)
-     int fd;
-     int level;
-     int optname;
-     void *optval;
-     size_t *optlen;
+getsockopt (int fd,
+           int level,
+           int optname,
+           void *optval,
+           socklen_t *optlen)
 {
   error_t err;
   char *buf = optval;
@@ -45,10 +43,10 @@ getsockopt (fd, level, optname, optval, optlen)
                                                 &buf, &buflen)))
     return __hurd_dfail (fd, err);
 
+  if (*optlen > buflen)
+    *optlen = buflen;
   if (buf != optval)
     {
-      if (*optlen < buflen)
-       *optlen = buflen;
       memcpy (optval, buf, *optlen);
       __vm_deallocate (__mach_task_self (), (vm_address_t) buf, buflen);
     }