about summary refs log tree commit diff
path: root/sysdeps
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/alpha/Dist2
-rw-r--r--sysdeps/gnu/errlist.c80
-rw-r--r--sysdeps/posix/readv.c34
-rw-r--r--sysdeps/posix/writev.c34
-rw-r--r--sysdeps/unix/sysv/linux/netinet/in.h31
5 files changed, 92 insertions, 89 deletions
diff --git a/sysdeps/alpha/Dist b/sysdeps/alpha/Dist
index 3cc9595dfb..022fa0379f 100644
--- a/sysdeps/alpha/Dist
+++ b/sysdeps/alpha/Dist
@@ -1,7 +1,7 @@
 setjmp_aux.c
 DEFS.h
 divrem.h
-divl.S divlu.S divq.S divqu.S reml.S remlu.S remq.S remqu.S
+divl.S divq.S reml.S remq.S
 _mcount.S
 stxcpy.S
 stxncpy.S
diff --git a/sysdeps/gnu/errlist.c b/sysdeps/gnu/errlist.c
index 3e62c5f127..4f96864abc 100644
--- a/sysdeps/gnu/errlist.c
+++ b/sysdeps/gnu/errlist.c
@@ -605,17 +605,53 @@ TRANS Go home and have a glass of warm, dairy-fresh milk. */
 TRANS This error code has no purpose. */
     [EGRATUITOUS] = N_("Gratuitous error"),
 #endif
-#ifdef ERESTART
+#ifdef EBADMSG
 /* */
-    [ERESTART] = N_("Interrupted system call should be restarted"),
+    [EBADMSG] = N_("Bad message"),
+#endif
+#ifdef EIDRM
+/* */
+    [EIDRM] = N_("Identifier removed"),
+#endif
+#ifdef EMULTIHOP
+/* */
+    [EMULTIHOP] = N_("Multihop attempted"),
+#endif
+#ifdef ENODATA
+/* */
+    [ENODATA] = N_("No data available"),
+#endif
+#ifdef ENOLINK
+/* */
+    [ENOLINK] = N_("Link has been severed"),
 #endif
 #ifdef ENOMSG
 /* */
     [ENOMSG] = N_("No message of desired type"),
 #endif
-#ifdef EIDRM
+#ifdef ENOSR
 /* */
-    [EIDRM] = N_("Identifier removed"),
+    [ENOSR] = N_("Out of streams resources"),
+#endif
+#ifdef ENOSTR
+/* */
+    [ENOSTR] = N_("Device not a stream"),
+#endif
+#ifdef EOVERFLOW
+/* */
+    [EOVERFLOW] = N_("Value too large for defined data type"),
+#endif
+#ifdef EPROTO
+/* */
+    [EPROTO] = N_("Protocol error"),
+#endif
+#ifdef ETIME
+/* */
+    [ETIME] = N_("Timer expired"),
+#endif
+#ifdef ERESTART
+/* */
+    [ERESTART] = N_("Interrupted system call should be restarted"),
 #endif
 #ifdef ECHRNG
 /* */
@@ -681,22 +717,6 @@ TRANS This error code has no purpose. */
 /* */
     [EBFONT] = N_("Bad font file format"),
 #endif
-#ifdef ENOSTR
-/* */
-    [ENOSTR] = N_("Device not a stream"),
-#endif
-#ifdef ENODATA
-/* */
-    [ENODATA] = N_("No data available"),
-#endif
-#ifdef ETIME
-/* */
-    [ETIME] = N_("Timer expired"),
-#endif
-#ifdef ENOSR
-/* */
-    [ENOSR] = N_("Out of streams resources"),
-#endif
 #ifdef ENONET
 /* */
     [ENONET] = N_("Machine is not on the network"),
@@ -705,10 +725,6 @@ TRANS This error code has no purpose. */
 /* */
     [ENOPKG] = N_("Package not installed"),
 #endif
-#ifdef ENOLINK
-/* */
-    [ENOLINK] = N_("Link has been severed"),
-#endif
 #ifdef EADV
 /* */
     [EADV] = N_("Advertise error"),
@@ -721,26 +737,10 @@ TRANS This error code has no purpose. */
 /* */
     [ECOMM] = N_("Communication error on send"),
 #endif
-#ifdef EPROTO
-/* */
-    [EPROTO] = N_("Protocol error"),
-#endif
-#ifdef EMULTIHOP
-/* */
-    [EMULTIHOP] = N_("Multihop attempted"),
-#endif
 #ifdef EDOTDOT
 /* */
     [EDOTDOT] = N_("RFS specific error"),
 #endif
-#ifdef EBADMSG
-/* */
-    [EBADMSG] = N_("Not a data message"),
-#endif
-#ifdef EOVERFLOW
-/* */
-    [EOVERFLOW] = N_("Value too large for defined data type"),
-#endif
 #ifdef ENOTUNIQ
 /* */
     [ENOTUNIQ] = N_("Name not unique on network"),
diff --git a/sysdeps/posix/readv.c b/sysdeps/posix/readv.c
index 116784eeab..7566fe6c6b 100644
--- a/sysdeps/posix/readv.c
+++ b/sysdeps/posix/readv.c
@@ -1,20 +1,20 @@
 /* Copyright (C) 1991, 1992, 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   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.
+   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.
 
-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.
+   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.
 
-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., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   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.  */
 
 #include <stdlib.h>
 #include <unistd.h>
@@ -43,10 +43,10 @@ readv (fd, vector, count)
     bytes += vector[i].iov_len;
 
   /* Allocate a temporary buffer to hold the data.  */
-  buffer = (char *) __alloca(bytes);
+  buffer = (char *) __alloca (bytes);
 
   /* Read the data.  */
-  bytes_read = read(fd, buffer, bytes);
+  bytes_read = read (fd, buffer, bytes);
   if (bytes_read <= 0)
     return -1;
 
@@ -55,9 +55,9 @@ readv (fd, vector, count)
   for (i = 0; i < count; ++i)
     {
 #define	min(a, b)	((a) > (b) ? (b) : (a))
-      size_t copy = min(vector[i].iov_len, bytes);
+      size_t copy = min (vector[i].iov_len, bytes);
 
-      (void) memcpy((PTR) vector[i].iov_base, (PTR) buffer, copy);
+      (void) memcpy ((void *) vector[i].iov_base, (void *) buffer, copy);
 
       buffer += copy;
       bytes -= copy;
diff --git a/sysdeps/posix/writev.c b/sysdeps/posix/writev.c
index 75a41d33b9..06306ad209 100644
--- a/sysdeps/posix/writev.c
+++ b/sysdeps/posix/writev.c
@@ -1,20 +1,20 @@
 /* Copyright (C) 1991, 1992, 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   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.
+   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.
 
-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.
+   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.
 
-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., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   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.  */
 
 #include <stdlib.h>
 #include <unistd.h>
@@ -43,7 +43,7 @@ writev (fd, vector, count)
     bytes += vector[i].iov_len;
 
   /* Allocate a temporary buffer to hold the data.  */
-  buffer = (char *) __alloca(bytes);
+  buffer = (char *) __alloca (bytes);
 
   /* Copy the data into BUFFER.  */
   to_copy = bytes;
@@ -51,9 +51,9 @@ writev (fd, vector, count)
   for (i = 0; i < count; ++i)
     {
 #define	min(a, b)	((a) > (b) ? (b) : (a))
-      size_t copy = min(vector[i].iov_len, to_copy);
+      size_t copy = min (vector[i].iov_len, to_copy);
 
-      (void) memcpy((PTR) bp, (PTR) vector[i].iov_base, copy);
+      (void) memcpy ((void *) bp, (void *) vector[i].iov_base, copy);
 
       bp += copy;
       to_copy -= copy;
@@ -61,5 +61,5 @@ writev (fd, vector, count)
 	break;
     }
 
-  return write(fd, buffer, bytes);
+  return write (fd, buffer, bytes);
 }
diff --git a/sysdeps/unix/sysv/linux/netinet/in.h b/sysdeps/unix/sysv/linux/netinet/in.h
index 0d0e031de1..86d1274a0c 100644
--- a/sysdeps/unix/sysv/linux/netinet/in.h
+++ b/sysdeps/unix/sysv/linux/netinet/in.h
@@ -24,7 +24,10 @@
 #include <sys/socket.h>
 #include <linux/in.h>
 
-/* Standard well-known ports.  */
+/* Standard well-known ports.  The use of these constants is
+   deprecated.  Instead use the contents of the file `/etc/services'
+   or similar databases by using the function getservbyname and
+   getservbyport.  */
 enum
   {
     IPPORT_ECHO = 7,		/* Echo service.  */
@@ -86,13 +89,13 @@ __BEGIN_DECLS
 
 /* Functions to convert between host and network byte order.  */
 
-extern unsigned long int ntohl __P ((unsigned long int));
-extern unsigned short int ntohs __P ((unsigned short int));
-extern unsigned long int htonl __P ((unsigned long int));
-extern unsigned short int htons __P ((unsigned short int));
+extern unsigned long int ntohl __P ((unsigned long int __long_word));
+extern unsigned short int ntohs __P ((unsigned short int __short_word));
+extern unsigned long int htonl __P ((unsigned long int __long_word));
+extern unsigned short int htons __P ((unsigned short int __short_word));
 
 /* Bind socket FD to a privileged IP address SIN.  */
-extern int bindresvport __P ((int __fd, struct sockaddr_in * __sin));
+extern int bindresvport __P ((int __fd, struct sockaddr_in * __sock_in));
 
 __END_DECLS
 
@@ -101,14 +104,14 @@ __END_DECLS
 #if __BYTE_ORDER == __BIG_ENDIAN
 /* The host byte order is the same as network byte order,
    so these functions are all just identity.  */
-#undef ntohl
-#define	ntohl(x)	(x)
-#undef ntohs
-#define	ntohs(x)	(x)
-#undef htonl
-#define	htonl(x)	(x)
-#undef htons
-#define	htons(x)	(x)
+# undef ntohl
+# define ntohl(x)	(x)
+# undef ntohs
+# define ntohs(x)	(x)
+# undef htonl
+# define htonl(x)	(x)
+# undef htons
+# define htons(x)	(x)
 #endif
 
 #endif	/* netinet/in.h */
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-29 08:39:33 +0000