Re: ED error code

[Manuel Menal]

On 31/10/2010 15:39, Roland McGrath wrote:
> If ED is a problem, then it should just be removed.  It's only there as a
> joke.  That said, my recollection is that POSIX does reserve all E[A-Z0-9]+
> macro names to the implementation for <errno.h> uses.  But I don't really
> recall if that's so.

Considering your answer and Pino's, here is a patch to remove ED (I
only changed the manual and ran the AWK scripts to update the .c/.h). 
I  couldn't find something about E[A-Z0-9]+ in POSIX, although it 
seems sensible.


diff --git a/manual/errno.texi b/manual/errno.texi
index 3b0af0c..864ab55 100644
--- a/manual/errno.texi
+++ b/manual/errno.texi
@@ -886,15 +886,6 @@ up, before it has connected to the file.
 @end deftypevr
 
 @comment errno.h
-@comment GNU: ?
-@deftypevr Macro int ED
-@comment errno 102 @c DO NOT REMOVE
-The experienced user will know what is wrong.
-@c This error code is a joke.  Its perror text is part of the joke.
-@c Don't change it.
-@end deftypevr
-
-@comment errno.h
 @comment GNU: You really blew it this time
 @deftypevr Macro int EGREGIOUS
 @comment errno 103 @c DO NOT REMOVE
diff --git a/sysdeps/gnu/errlist.c b/sysdeps/gnu/errlist.c
index 28a295f..af9bd4e 100644
--- a/sysdeps/gnu/errlist.c
+++ b/sysdeps/gnu/errlist.c
@@ -958,17 +958,6 @@ TRANS up, before it has connected to the file. */
 # define ERR_MAX EDIED
 # endif
 #endif
-#ifdef ED
-/*
-TRANS The experienced user will know what is wrong.
-TRANS @c This error code is a joke.  Its perror text is part of the joke.
-TRANS @c Don't change it. */
-    [ERR_REMAP (ED)] = N_("?"),
-# if ED > ERR_MAX
-# undef ERR_MAX
-# define ERR_MAX ED
-# endif
-#endif
 #ifdef EGREGIOUS
 /*
 TRANS You did @strong{what}? */
diff --git a/sysdeps/mach/hurd/bits/errno.h b/sysdeps/mach/hurd/bits/errno.h
index a7d57ad..43abc67 100644
--- a/sysdeps/mach/hurd/bits/errno.h
+++ b/sysdeps/mach/hurd/bits/errno.h
@@ -182,8 +182,6 @@ enum __error_t_codes
 #define        EBACKGROUND     _HURD_ERRNO (100)/* Inappropriate operation for 
background process */
        EDIED           = _HURD_ERRNO (101),
 #define        EDIED           _HURD_ERRNO (101)/* Translator died */
-       ED              = _HURD_ERRNO (102),
-#define        ED              _HURD_ERRNO (102)/* ? */
        EGREGIOUS       = _HURD_ERRNO (103),
 #define        EGREGIOUS       _HURD_ERRNO (103)/* You really blew it this 
time */
        EIEIO           = _HURD_ERRNO (104),
@@ -212,8 +210,8 @@ enum __error_t_codes
 #define        EPROTO          _HURD_ERRNO (116)/* Protocol error */
        ETIME           = _HURD_ERRNO (117),
 #define        ETIME           _HURD_ERRNO (117)/* Timer expired */
-       ECANCELED       = _HURD_ERRNO (118),
-#define        ECANCELED       _HURD_ERRNO (118)/* Operation canceled */
+       ECANCELED       = _HURD_ERRNO (119),
+#define        ECANCELED       _HURD_ERRNO (119)/* Operation canceled */
 
        /* Errors from <mach/message.h>.  */
        EMACH_SEND_IN_PROGRESS          = 0x10000001,
@@ -297,7 +295,7 @@ enum __error_t_codes
 
 };
 
-#define        _HURD_ERRNOS    119
+#define        _HURD_ERRNOS    120
 
 /* User-visible type of error codes.  It is ok to use `int' or
    `kern_return_t' for these, but with `error_t' the debugger prints


HTH,

-- 
Manuel Menal

signature.asc
Description: OpenPGP digital signature