Hi,
Before removig nls, I would like to unify all error messages in
- include comment
- libc comment
- nls C
- man page
The EPROGUNAVAIL change is just beautification. Any objections
against that?
ok?
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 23 Oct 2015 21:41:13 -0000
@@ -142,7 +142,7 @@
#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 EPROGUNAVAIL 74 /* RPC program not available */
#define EPROGMISMATCH 75 /* Program version wrong */
#define EPROCUNAVAIL 76 /* Bad procedure for program */
#endif /* __BSD_VISIBLE */
@@ -160,9 +160,9 @@
#define EILSEQ 84 /* Illegal byte sequence */
#if __BSD_VISIBLE
#define ENOMEDIUM 85 /* No medium found */
-#define EMEDIUMTYPE 86 /* Wrong Medium Type */
+#define EMEDIUMTYPE 86 /* Wrong medium type */
#endif /* __BSD_VISIBLE */
-#define EOVERFLOW 87 /* Conversion overflow */
+#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 */
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.
