From patchwork Tue Mar 20 02:11:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 26387 Received: (qmail 130549 invoked by alias); 20 Mar 2018 02:11:50 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 130467 invoked by uid 89); 20 Mar 2018 02:11:45 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, SPF_NEUTRAL, URIBL_RED autolearn=ham version=3.3.2 spammy=Hx-languages-length:2766, H*r:sk:static-, died, Hx-spam-relays-external:sk:static- X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault Subject: [hurd,commited] Fix errno values Date: Tue, 20 Mar 2018 03:11:39 +0100 Message-Id: <20180320021139.3594-1-samuel.thibault@ens-lyon.org> * manual/errno.texi (EOWNERDEAD, ENOTRECOVERABLE): Remove errno values from Linux-specific section now that it is in the GNU section. * sysdeps/gnu/errlist.c: Regenerate. --- ChangeLog | 6 ++++++ manual/errno.texi | 10 ---------- sysdeps/gnu/errlist.c | 32 ++++++++++++++++---------------- 3 files changed, 22 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index 08488fe2b2..3399e567b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2018-03-20 Samuel Thibault + + * manual/errno.texi (EOWNERDEAD, ENOTRECOVERABLE): Remove errno + values from Linux-specific section now that it is in the GNU section. + * sysdeps/gnu/errlist.c: Regenerate. + 2018-03-20 Joseph Myers * math/Makefile (libm-narrow-fns): Add sub. diff --git a/manual/errno.texi b/manual/errno.texi index 8917cccb1e..b195b635f1 100644 --- a/manual/errno.texi +++ b/manual/errno.texi @@ -1111,16 +1111,6 @@ They are not yet documented.} @errno{EKEYREJECTED, ???/???, Key was rejected by service} @end deftypevr -@deftypevr Macro int EOWNERDEAD -@standards{Linux, errno.h} -@errno{EOWNERDEAD, ???/???, Owner died} -@end deftypevr - -@deftypevr Macro int ENOTRECOVERABLE -@standards{Linux, errno.h} -@errno{ENOTRECOVERABLE, ???/???, State not recoverable} -@end deftypevr - @deftypevr Macro int ERFKILL @standards{Linux, errno.h} @errno{ERFKILL, ???/???, Operation not possible due to RF-kill} diff --git a/sysdeps/gnu/errlist.c b/sysdeps/gnu/errlist.c index 4a1c093ed0..31ebfa9491 100644 --- a/sysdeps/gnu/errlist.c +++ b/sysdeps/gnu/errlist.c @@ -1090,6 +1090,22 @@ TRANS error; @pxref{Cancel AIO Operations}. */ # define ERR_MAX ECANCELED # 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 #ifdef ERESTART /* */ [ERR_REMAP (ERESTART)] = N_("Interrupted system call should be restarted"), @@ -1434,22 +1450,6 @@ TRANS error; @pxref{Cancel AIO Operations}. */ # 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 #ifdef ERFKILL /* */ [ERR_REMAP (ERFKILL)] = N_("Operation not possible due to RF-kill"),