diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | manual/errno.texi | 36 | ||||
| -rw-r--r-- | nptl/ChangeLog | 3 | ||||
| -rw-r--r-- | nptl/pthread_mutex_trylock.c | 1 | ||||
| -rw-r--r-- | sysdeps/gnu/errlist.c | 48 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/Versions | 3 |
6 files changed, 94 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 53cf28f074..f5e0d45bca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-12-24 Ulrich Drepper <drepper@redhat.com> + * manual/errno.texi: Add new Linux errno codes. + * sysdeps/unix/sysv/linux/Versions: Add new errlist-compat entry + for up to 132 errnos. * sysdeps/unix/sysv/linux/bits/errno.h: Define EOWNERDEAD and ENOTRECOVERABLE if not already defined. diff --git a/manual/errno.texi b/manual/errno.texi index c799d268f8..e230506427 100644 --- a/manual/errno.texi +++ b/manual/errno.texi @@ -1229,6 +1229,42 @@ They are not yet documented.} @comment errno ???/??? @end deftypevr +@comment errno.h +@comment Linux: Required key not available +@deftypevr Macro int ENOKEY +@comment errno ???/??? +@end deftypevr + +@comment errno.h +@comment Linux: Key has expired +@deftypevr Macro int EKEYEXPIRED +@comment errno ???/??? +@end deftypevr + +@comment errno.h +@comment Linux: Key has been revoked +@deftypevr Macro int EKEYREVOKED +@comment errno ???/??? +@end deftypevr + +@comment errno.h +@comment Linux: Key was rejected by service +@deftypevr Macro int EKEYREJECTED +@comment errno ???/??? +@end deftypevr + +@comment errno.h +@comment Linux: Owner died +@deftypevr Macro int EOWNERDEAD +@comment errno ???/??? +@end deftypevr + +@comment errno.h +@comment Linux: State not recoverable +@deftypevr Macro int ENOTRECOVERABLE +@comment errno ???/??? +@end deftypevr + @node Error Messages, , Error Codes, Error Reporting @section Error Messages diff --git a/nptl/ChangeLog b/nptl/ChangeLog index a41ce03284..877c858118 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,5 +1,8 @@ 2005-12-24 Ulrich Drepper <drepper@redhat.com> + * pthread_mutex_trylock.c (__pthread_mutex_trylock): Add break + missing after last change. + * version.c: Update cpoyright year. 2005-12-23 Ulrich Drepper <drepper@redhat.com> diff --git a/nptl/pthread_mutex_trylock.c b/nptl/pthread_mutex_trylock.c index a50b9173ac..8213f90da9 100644 --- a/nptl/pthread_mutex_trylock.c +++ b/nptl/pthread_mutex_trylock.c @@ -68,6 +68,7 @@ __pthread_mutex_trylock (mutex) return 0; } + break; default: /* Correct code cannot set any other type. */ diff --git a/sysdeps/gnu/errlist.c b/sysdeps/gnu/errlist.c index 1508311a4a..56da01756d 100644 --- a/sysdeps/gnu/errlist.c +++ b/sysdeps/gnu/errlist.c @@ -1408,6 +1408,54 @@ TRANS error; @pxref{Cancel AIO Operations}. */ # define ERR_MAX EMEDIUMTYPE # endif #endif +#ifdef ENOKEY +/* */ + [ERR_REMAP (ENOKEY)] = N_("Required key not available"), +# if ENOKEY > ERR_MAX +# undef ERR_MAX +# define ERR_MAX ENOKEY +# endif +#endif +#ifdef EKEYEXPIRED +/* */ + [ERR_REMAP (EKEYEXPIRED)] = N_("Key has expired"), +# if EKEYEXPIRED > ERR_MAX +# undef ERR_MAX +# define ERR_MAX EKEYEXPIRED +# endif +#endif +#ifdef EKEYREVOKED +/* */ + [ERR_REMAP (EKEYREVOKED)] = N_("Key has been revoked"), +# if EKEYREVOKED > ERR_MAX +# undef ERR_MAX +# define ERR_MAX EKEYREVOKED +# endif +#endif +#ifdef EKEYREJECTED +/* */ + [ERR_REMAP (EKEYREJECTED)] = N_("Key was rejected by service"), +# if EKEYREJECTED > ERR_MAX +# undef ERR_MAX +# define ERR_MAX EKEYREJECTED +# endif +#endif +#ifdef EOWNERDEAD +/* */ + [ERR_REMAP (EOWNERDEAD)] = N_("Owner died"), +# if EOWNERDEAD > ERR_MAX +# undef ERR_MAX +# define ERR_MAX EOWNERDEAD +# endif +#endif +#ifdef ENOTRECOVERABLE +/* */ + [ERR_REMAP (ENOTRECOVERABLE)] = N_("State not recoverable"), +# if ENOTRECOVERABLE > ERR_MAX +# undef ERR_MAX +# define ERR_MAX ENOTRECOVERABLE +# endif +#endif }; #define NERR \ diff --git a/sysdeps/unix/sysv/linux/Versions b/sysdeps/unix/sysv/linux/Versions index b34fd310a3..436573a428 100644 --- a/sysdeps/unix/sysv/linux/Versions +++ b/sysdeps/unix/sysv/linux/Versions @@ -117,6 +117,9 @@ libc { } GLIBC_2.4 { inotify_init; inotify_add_watch; inotify_rm_watch; + + #errlist-compat 132 + _sys_errlist; sys_errlist; _sys_nerr; sys_nerr; } GLIBC_PRIVATE { # functions used in other libraries |