On Sat, Oct 24, 2015 at 02:54:54AM +0159, Jiri Navratil wrote:
> Hi Alexander,
>
> On Sat, Oct 24, 2015 at 12:41:18AM +0200, Alexander Bluhm wrote:
> > -#define EOVERFLOW 87 /* Conversion overflow */
> > +#define EOVERFLOW 87 /* Value too large to be stored in data
> > type */
>
> I noticed this "missing tab".
>
> Thank you,
> Jiri
Actually that was intensional as the line would get too long. An
alternative would be to remove some tabs. But that makes the diff
unreadable. If I get an ok, I will commit this version.
bluhm
Index: sys/sys/errno.h
===================================================================
RCS file: /data/mirror/openbsd/cvs/src/sys/sys/errno.h,v
retrieving revision 1.23
diff -u -p -r1.23 errno.h
--- sys/sys/errno.h 19 Sep 2014 16:50:20 -0000 1.23
+++ sys/sys/errno.h 24 Oct 2015 10:01:40 -0000
@@ -39,140 +39,140 @@
#include <sys/cdefs.h>
-#define EPERM 1 /* Operation not permitted */
-#define ENOENT 2 /* No such file or directory */
-#define ESRCH 3 /* No such process */
-#define EINTR 4 /* Interrupted system call */
-#define EIO 5 /* Input/output error */
-#define ENXIO 6 /* Device not configured */
-#define E2BIG 7 /* Argument list too long */
-#define ENOEXEC 8 /* Exec format error */
-#define EBADF 9 /* Bad file descriptor */
-#define ECHILD 10 /* No child processes */
-#define EDEADLK 11 /* Resource deadlock avoided */
- /* 11 was EAGAIN */
-#define ENOMEM 12 /* Cannot allocate memory */
-#define EACCES 13 /* Permission denied */
-#define EFAULT 14 /* Bad address */
+#define EPERM 1 /* Operation not permitted */
+#define ENOENT 2 /* No such file or directory */
+#define ESRCH 3 /* No such process */
+#define EINTR 4 /* Interrupted system call */
+#define EIO 5 /* Input/output error */
+#define ENXIO 6 /* Device not configured */
+#define E2BIG 7 /* Argument list too long */
+#define ENOEXEC 8 /* Exec format error */
+#define EBADF 9 /* Bad file descriptor */
+#define ECHILD 10 /* No child processes */
+#define EDEADLK 11 /* Resource deadlock avoided */
+ /* 11 was EAGAIN */
+#define ENOMEM 12 /* Cannot allocate memory */
+#define EACCES 13 /* Permission denied */
+#define EFAULT 14 /* Bad address */
#if __BSD_VISIBLE
-#define ENOTBLK 15 /* Block device required */
+#define ENOTBLK 15 /* Block device required */
#endif
-#define EBUSY 16 /* Device busy */
-#define EEXIST 17 /* File exists */
-#define EXDEV 18 /* Cross-device link */
-#define ENODEV 19 /* Operation not supported by
device */
-#define ENOTDIR 20 /* Not a directory */
-#define EISDIR 21 /* Is a directory */
-#define EINVAL 22 /* Invalid argument */
-#define ENFILE 23 /* Too many open files in
system */
-#define EMFILE 24 /* Too many open files */
-#define ENOTTY 25 /* Inappropriate ioctl for
device */
-#define ETXTBSY 26 /* Text file busy */
-#define EFBIG 27 /* File too large */
-#define ENOSPC 28 /* No space left on device */
-#define ESPIPE 29 /* Illegal seek */
-#define EROFS 30 /* Read-only file system */
-#define EMLINK 31 /* Too many links */
-#define EPIPE 32 /* Broken pipe */
+#define EBUSY 16 /* Device busy */
+#define EEXIST 17 /* File exists */
+#define EXDEV 18 /* Cross-device link */
+#define ENODEV 19 /* Operation not supported by device */
+#define ENOTDIR 20 /* Not a directory */
+#define EISDIR 21 /* Is a directory */
+#define EINVAL 22 /* Invalid argument */
+#define ENFILE 23 /* Too many open files in system */
+#define EMFILE 24 /* Too many open files */
+#define ENOTTY 25 /* Inappropriate ioctl for device */
+#define ETXTBSY 26 /* Text file busy */
+#define EFBIG 27 /* File too large */
+#define ENOSPC 28 /* No space left on device */
+#define ESPIPE 29 /* Illegal seek */
+#define EROFS 30 /* Read-only file system */
+#define EMLINK 31 /* Too many links */
+#define EPIPE 32 /* Broken pipe */
/* math software */
-#define EDOM 33 /* Numerical argument out of
domain */
-#define ERANGE 34 /* Result too large */
+#define EDOM 33 /* Numerical argument out of domain */
+#define ERANGE 34 /* Result too large */
/* non-blocking and interrupt i/o */
-#define EAGAIN 35 /* Resource temporarily
unavailable */
-#define EWOULDBLOCK EAGAIN /* Operation would block */
-#define EINPROGRESS 36 /* Operation now in progress */
-#define EALREADY 37 /* Operation already in
progress */
+#define EAGAIN 35 /* Resource temporarily unavailable */
+#define EWOULDBLOCK EAGAIN /* Operation would block */
+#define EINPROGRESS 36 /* Operation now in progress */
+#define EALREADY 37 /* Operation already in progress */
/* ipc/network software -- argument errors */
-#define ENOTSOCK 38 /* Socket operation on
non-socket */
-#define EDESTADDRREQ 39 /* Destination address required
*/
-#define EMSGSIZE 40 /* Message too long */
-#define EPROTOTYPE 41 /* Protocol wrong type for
socket */
-#define ENOPROTOOPT 42 /* Protocol not available */
-#define EPROTONOSUPPORT 43 /* Protocol not supported */
+#define ENOTSOCK 38 /* Socket operation on non-socket */
+#define EDESTADDRREQ 39 /* Destination address required */
+#define EMSGSIZE 40 /* Message too long */
+#define EPROTOTYPE 41 /* Protocol wrong type for socket */
+#define ENOPROTOOPT 42 /* Protocol not available */
+#define EPROTONOSUPPORT 43 /* Protocol not supported */
#if __BSD_VISIBLE
-#define ESOCKTNOSUPPORT 44 /* Socket type not supported */
+#define ESOCKTNOSUPPORT 44 /* Socket type not supported */
#endif
-#define EOPNOTSUPP 45 /* Operation not supported */
+#define EOPNOTSUPP 45 /* Operation not supported */
#if __BSD_VISIBLE
-#define EPFNOSUPPORT 46 /* Protocol family not
supported */
+#define EPFNOSUPPORT 46 /* Protocol family not supported */
#endif
-#define EAFNOSUPPORT 47 /* Address family not supported
by protocol family */
-#define EADDRINUSE 48 /* Address already in use */
-#define EADDRNOTAVAIL 49 /* Can't assign requested
address */
+#define EAFNOSUPPORT 47 /* Address family not supported by protocol
family */
+#define EADDRINUSE 48 /* Address already in use */
+#define EADDRNOTAVAIL 49 /* Can't assign requested address */
/* ipc/network software -- operational errors */
-#define ENETDOWN 50 /* Network is down */
-#define ENETUNREACH 51 /* Network is unreachable */
-#define ENETRESET 52 /* Network dropped connection
on reset */
-#define ECONNABORTED 53 /* Software caused connection
abort */
-#define ECONNRESET 54 /* Connection reset by peer */
-#define ENOBUFS 55 /* No buffer space available */
-#define EISCONN 56 /* Socket is already connected
*/
-#define ENOTCONN 57 /* Socket is not connected */
+#define ENETDOWN 50 /* Network is down */
+#define ENETUNREACH 51 /* Network is unreachable */
+#define ENETRESET 52 /* Network dropped connection on reset */
+#define ECONNABORTED 53 /* Software caused connection abort */
+#define ECONNRESET 54 /* Connection reset by peer */
+#define ENOBUFS 55 /* No buffer space available */
+#define EISCONN 56 /* Socket is already connected */
+#define ENOTCONN 57 /* Socket is not connected */
#if __BSD_VISIBLE
-#define ESHUTDOWN 58 /* Can't send after socket
shutdown */
-#define ETOOMANYREFS 59 /* Too many references: can't
splice */
+#define ESHUTDOWN 58 /* Can't send after socket shutdown */
+#define ETOOMANYREFS 59 /* Too many references: can't splice */
#endif /* __BSD_VISIBLE */
-#define ETIMEDOUT 60 /* Operation timed out */
-#define ECONNREFUSED 61 /* Connection refused */
+#define ETIMEDOUT 60 /* Operation timed out */
+#define ECONNREFUSED 61 /* Connection refused */
-#define ELOOP 62 /* Too many levels of symbolic
links */
-#define ENAMETOOLONG 63 /* File name too long */
+#define ELOOP 62 /* Too many levels of symbolic links */
+#define ENAMETOOLONG 63 /* File name too long */
/* should be rearranged */
#if __BSD_VISIBLE
-#define EHOSTDOWN 64 /* Host is down */
+#define EHOSTDOWN 64 /* Host is down */
#endif /* __BSD_VISIBLE */
-#define EHOSTUNREACH 65 /* No route to host */
-#define ENOTEMPTY 66 /* Directory not empty */
+#define EHOSTUNREACH 65 /* No route to host */
+#define ENOTEMPTY 66 /* Directory not empty */
/* quotas & mush */
#if __BSD_VISIBLE
-#define EPROCLIM 67 /* Too many processes */
-#define EUSERS 68 /* Too many users */
+#define EPROCLIM 67 /* Too many processes */
+#define EUSERS 68 /* Too many users */
#endif /* __BSD_VISIBLE */
-#define EDQUOT 69 /* Disk quota exceeded */
+#define EDQUOT 69 /* Disk quota exceeded */
/* Network File System */
-#define ESTALE 70 /* Stale NFS file handle */
+#define ESTALE 70 /* Stale NFS file handle */
#if __BSD_VISIBLE
-#define EREMOTE 71 /* Too many levels of remote in
path */
-#define EBADRPC 72 /* RPC struct is bad */
-#define ERPCMISMATCH 73 /* RPC version wrong */
-#define EPROGUNAVAIL 74 /* RPC prog. not avail */
-#define EPROGMISMATCH 75 /* Program version wrong */
-#define EPROCUNAVAIL 76 /* Bad procedure for program */
+#define EREMOTE 71 /* Too many levels of remote in path */
+#define EBADRPC 72 /* RPC struct is bad */
+#define ERPCMISMATCH 73 /* RPC version wrong */
+#define EPROGUNAVAIL 74 /* RPC program not available */
+#define EPROGMISMATCH 75 /* Program version wrong */
+#define EPROCUNAVAIL 76 /* Bad procedure for program */
#endif /* __BSD_VISIBLE */
-#define ENOLCK 77 /* No locks available */
-#define ENOSYS 78 /* Function not implemented */
+#define ENOLCK 77 /* No locks available */
+#define ENOSYS 78 /* Function not implemented */
#if __BSD_VISIBLE
-#define EFTYPE 79 /* Inappropriate file type or
format */
-#define EAUTH 80 /* Authentication error */
-#define ENEEDAUTH 81 /* Need authenticator */
-#define EIPSEC 82 /* IPsec processing failure */
-#define ENOATTR 83 /* Attribute not found */
+#define EFTYPE 79 /* Inappropriate file type or format */
+#define EAUTH 80 /* Authentication error */
+#define ENEEDAUTH 81 /* Need authenticator */
+#define EIPSEC 82 /* IPsec processing failure */
+#define ENOATTR 83 /* Attribute not found */
#endif /* __BSD_VISIBLE */
-#define EILSEQ 84 /* Illegal byte sequence */
+#define EILSEQ 84 /* Illegal byte sequence */
#if __BSD_VISIBLE
-#define ENOMEDIUM 85 /* No medium found */
-#define EMEDIUMTYPE 86 /* Wrong Medium Type */
+#define ENOMEDIUM 85 /* No medium found */
+#define EMEDIUMTYPE 86 /* Wrong medium type */
#endif /* __BSD_VISIBLE */
-#define EOVERFLOW 87 /* Conversion overflow */
-#define ECANCELED 88 /* Operation canceled */
-#define EIDRM 89 /* Identifier removed */
-#define ENOMSG 90 /* No message of desired type */
-#define ENOTSUP 91 /* Not supported */
+#define EOVERFLOW 87 /* Value too large to be stored in data type */
+#define ECANCELED 88 /* Operation canceled */
+#define EIDRM 89 /* Identifier removed */
+#define ENOMSG 90 /* No message of desired type */
+#define ENOTSUP 91 /* Not supported */
#if __BSD_VISIBLE
-#define ELAST 91 /* Must be equal largest errno
*/
+#define ELAST 91 /* Must be equal largest errno */
#endif /* __BSD_VISIBLE */
#ifdef _KERNEL
/* pseudo-errors returned inside kernel to modify return to process */
-#define ERESTART -1 /* restart syscall */
-#define EJUSTRETURN -2 /* don't modify regs, just
return */
+#define ERESTART -1 /* restart syscall */
+#define EJUSTRETURN -2 /* don't modify regs, just return */
#endif
Index: lib/libc/gen/errlist.c
===================================================================
RCS file: /data/mirror/openbsd/cvs/src/lib/libc/gen/errlist.c,v
retrieving revision 1.17
diff -u -p -r1.17 errlist.c
--- lib/libc/gen/errlist.c 19 Sep 2015 04:02:21 -0000 1.17
+++ lib/libc/gen/errlist.c 23 Oct 2015 21:20:39 -0000
@@ -122,7 +122,7 @@ const char *const sys_errlist[] = {
"Too many levels of remote in path", /* 71 - EREMOTE */
"RPC struct is bad", /* 72 - EBADRPC */
"RPC version wrong", /* 73 - ERPCMISMATCH */
- "RPC prog. not avail", /* 74 - EPROGUNAVAIL */
+ "RPC program not available", /* 74 - EPROGUNAVAIL */
"Program version wrong", /* 75 - EPROGMISMATCH */
"Bad procedure for program", /* 76 - EPROCUNAVAIL */
Index: lib/libc/nls/C.msg
===================================================================
RCS file: /data/mirror/openbsd/cvs/src/lib/libc/nls/C.msg,v
retrieving revision 1.2
diff -u -p -r1.2 C.msg
--- lib/libc/nls/C.msg 24 Nov 2009 09:22:22 -0000 1.2
+++ lib/libc/nls/C.msg 23 Oct 2015 21:22:04 -0000
@@ -118,7 +118,7 @@ $ ESHUTDOWN
$ ETOOMANYREFS
59 Too many references: can't splice
$ ETIMEDOUT
-60 Connection timed out
+60 Operation timed out
$ ECONNREFUSED
61 Connection refused
$ ELOOP
@@ -136,7 +136,7 @@ $ EPROCLIM
$ EUSERS
68 Too many users
$ EDQUOT
-69 Disc quota exceeded
+69 Disk quota exceeded
$ ESTALE
70 Stale NFS file handle
$ EREMOTE
@@ -146,7 +146,7 @@ $ EBADRPC
$ ERPCMISMATCH
73 RPC version wrong
$ EPROGUNAVAIL
-74 RPC prog. not avail
+74 RPC program not available
$ EPROGMISMATCH
75 Program version wrong
$ EPROCUNAVAIL
Index: lib/libc/sys/intro.2
===================================================================
RCS file: /data/mirror/openbsd/cvs/src/lib/libc/sys/intro.2,v
retrieving revision 1.59
diff -u -p -r1.59 intro.2
--- lib/libc/sys/intro.2 28 Jul 2015 22:48:31 -0000 1.59
+++ lib/libc/sys/intro.2 23 Oct 2015 21:23:10 -0000
@@ -349,7 +349,7 @@ was supplied to a remove directory or re
.It Er 67 EPROCLIM Em "Too many processes" .
.It Er 68 EUSERS Em "Too many users" .
The quota system ran out of table entries.
-.It Er 69 EDQUOT Em "Disc quota exceeded" .
+.It Er 69 EDQUOT Em "Disk quota exceeded" .
A
.Xr write 2
to an ordinary file, the creation of a directory or symbolic link,
@@ -369,7 +369,7 @@ information was unsuccessful.
The version of
.Xr rpc 3
on the remote peer is not compatible with the local version.
-.It Er 74 EPROGUNAVAIL Em "RPC prog. not avail" .
+.It Er 74 EPROGUNAVAIL Em "RPC program not available" .
The requested
.Xr rpc 3
program is not registered on the remote host.
