diff options
author | Marcus Brinkmann <[email protected]> | 2003-08-19 19:30:56 +0000 |
---|---|---|
committer | Marcus Brinkmann <[email protected]> | 2003-08-19 19:30:56 +0000 |
commit | eb45f317a64399928e83765940492c8258982c41 (patch) | |
tree | fb4e2f8410d6acdf716bd6b3c0dea217ac4ab845 | |
parent | . (diff) | |
download | libgpg-error-eb45f317a64399928e83765940492c8258982c41.tar.gz libgpg-error-eb45f317a64399928e83765940492c8258982c41.zip |
2003-08-19 Marcus Brinkmann <[email protected]>
* src/gpg-error.h (GPG_ERR_SYSTEM_ERROR): Fix value (should have
been 2^15, was 2^14).
(GPG_ERR_CODE_DIM): Fix value (should have been 65536, was 32768).
Change the error codes of all system errors to have the
GPG_ERR_SYSTEM_ERROR bit set.
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | src/gpg-error.h | 297 |
2 files changed, 158 insertions, 147 deletions
@@ -1,3 +1,11 @@ +2003-08-19 Marcus Brinkmann <[email protected]> + + * src/gpg-error.h (GPG_ERR_SYSTEM_ERROR): Fix value (should have + been 2^15, was 2^14). + (GPG_ERR_CODE_DIM): Fix value (should have been 65536, was 32768). + Change the error codes of all system errors to have the + GPG_ERR_SYSTEM_ERROR bit set. + 2003-08-06 Marcus Brinkmann <[email protected]> * code-from-errno.c, code-to-errno.c, err-codes.h.in, diff --git a/src/gpg-error.h b/src/gpg-error.h index 3ff4d82..7b71bea 100644 --- a/src/gpg-error.h +++ b/src/gpg-error.h @@ -270,153 +270,157 @@ typedef enum GPG_ERR_UNKNOWN_ERRNO = 16382, GPG_ERR_EOF = 16383, /* This was once a -1. Pity. */ + /* 16384 - 32767 are reserved for future extensions. */ + /* The following error codes are used to map system errors. */ - GPG_ERR_E2BIG = 16384, - GPG_ERR_EACCES = 16385, - GPG_ERR_EADDRINUSE = 16386, - GPG_ERR_EADDRNOTAVAIL = 16387, - GPG_ERR_EADV = 16388, - GPG_ERR_EAFNOSUPPORT = 16389, - GPG_ERR_EAGAIN = 16390, - GPG_ERR_EALREADY = 16391, - GPG_ERR_EAUTH = 16392, - GPG_ERR_EBACKGROUND = 16393, - GPG_ERR_EBADE = 16394, - GPG_ERR_EBADF = 16395, - GPG_ERR_EBADFD = 16396, - GPG_ERR_EBADMSG = 16397, - GPG_ERR_EBADR = 16398, - GPG_ERR_EBADRPC = 16399, - GPG_ERR_EBADRQC = 16400, - GPG_ERR_EBADSLT = 16401, - GPG_ERR_EBFONT = 16402, - GPG_ERR_EBUSY = 16403, - GPG_ERR_ECANCELED = 16404, - GPG_ERR_ECHILD = 16405, - GPG_ERR_ECHRNG = 16406, - GPG_ERR_ECOMM = 16407, - GPG_ERR_ECONNABORTED = 16408, - GPG_ERR_ECONNREFUSED = 16409, - GPG_ERR_ECONNRESET = 16410, - GPG_ERR_ED = 16411, - GPG_ERR_EDEADLK = 16412, - GPG_ERR_EDEADLOCK = 16413, - GPG_ERR_EDESTADDRREQ = 16414, - GPG_ERR_EDIED = 16415, - GPG_ERR_EDOM = 16416, - GPG_ERR_EDOTDOT = 16417, - GPG_ERR_EDQUOT = 16418, - GPG_ERR_EEXIST = 16419, - GPG_ERR_EFAULT = 16420, - GPG_ERR_EFBIG = 16421, - GPG_ERR_EFTYPE = 16422, - GPG_ERR_EGRATUITOUS = 16423, - GPG_ERR_EGREGIOUS = 16424, - GPG_ERR_EHOSTDOWN = 16425, - GPG_ERR_EHOSTUNREACH = 16426, - GPG_ERR_EIDRM = 16427, - GPG_ERR_EIEIO = 16428, - GPG_ERR_EILSEQ = 16429, - GPG_ERR_EINPROGRESS = 16430, - GPG_ERR_EINTR = 16431, - GPG_ERR_EINVAL = 16432, - GPG_ERR_EIO = 16433, - GPG_ERR_EISCONN = 16434, - GPG_ERR_EISDIR = 16435, - GPG_ERR_EISNAM = 16436, - GPG_ERR_EL2HLT = 16437, - GPG_ERR_EL2NSYNC = 16438, - GPG_ERR_EL3HLT = 16439, - GPG_ERR_EL3RST = 16440, - GPG_ERR_ELIBACC = 16441, - GPG_ERR_ELIBBAD = 16442, - GPG_ERR_ELIBEXEC = 16443, - GPG_ERR_ELIBMAX = 16444, - GPG_ERR_ELIBSCN = 16445, - GPG_ERR_ELNRNG = 16446, - GPG_ERR_ELOOP = 16447, - GPG_ERR_EMEDIUMTYPE = 16448, - GPG_ERR_EMFILE = 16449, - GPG_ERR_EMLINK = 16450, - GPG_ERR_EMSGSIZE = 16451, - GPG_ERR_EMULTIHOP = 16452, - GPG_ERR_ENAMETOOLONG = 16453, - GPG_ERR_ENAVAIL = 16454, - GPG_ERR_ENEEDAUTH = 16455, - GPG_ERR_ENETDOWN = 16456, - GPG_ERR_ENETRESET = 16457, - GPG_ERR_ENETUNREACH = 16458, - GPG_ERR_ENFILE = 16459, - GPG_ERR_ENOANO = 16460, - GPG_ERR_ENOBUFS = 16461, - GPG_ERR_ENOCSI = 16462, - GPG_ERR_ENODATA = 16463, - GPG_ERR_ENODEV = 16464, - GPG_ERR_ENOENT = 16465, - GPG_ERR_ENOEXEC = 16466, - GPG_ERR_ENOLCK = 16467, - GPG_ERR_ENOLINK = 16468, - GPG_ERR_ENOMEDIUM = 16469, - GPG_ERR_ENOMEM = 16470, - GPG_ERR_ENOMSG = 16471, - GPG_ERR_ENONET = 16472, - GPG_ERR_ENOPKG = 16473, - GPG_ERR_ENOPROTOOPT = 16474, - GPG_ERR_ENOSPC = 16475, - GPG_ERR_ENOSR = 16476, - GPG_ERR_ENOSTR = 16477, - GPG_ERR_ENOSYS = 16478, - GPG_ERR_ENOTBLK = 16479, - GPG_ERR_ENOTCONN = 16480, - GPG_ERR_ENOTDIR = 16481, - GPG_ERR_ENOTEMPTY = 16482, - GPG_ERR_ENOTNAM = 16483, - GPG_ERR_ENOTSOCK = 16484, - GPG_ERR_ENOTSUP = 16485, - GPG_ERR_ENOTTY = 16486, - GPG_ERR_ENOTUNIQ = 16487, - GPG_ERR_ENXIO = 16488, - GPG_ERR_EOPNOTSUPP = 16489, - GPG_ERR_EOVERFLOW = 16490, - GPG_ERR_EPERM = 16491, - GPG_ERR_EPFNOSUPPORT = 16492, - GPG_ERR_EPIPE = 16493, - GPG_ERR_EPROCLIM = 16494, - GPG_ERR_EPROCUNAVAIL = 16495, - GPG_ERR_EPROGMISMATCH = 16496, - GPG_ERR_EPROGUNAVAIL = 16497, - GPG_ERR_EPROTO = 16498, - GPG_ERR_EPROTONOSUPPORT = 16499, - GPG_ERR_EPROTOTYPE = 16500, - GPG_ERR_ERANGE = 16501, - GPG_ERR_EREMCHG = 16502, - GPG_ERR_EREMOTE = 16503, - GPG_ERR_EREMOTEIO = 16504, - GPG_ERR_ERESTART = 16505, - GPG_ERR_EROFS = 16506, - GPG_ERR_ERPCMISMATCH = 16507, - GPG_ERR_ESHUTDOWN = 16508, - GPG_ERR_ESOCKTNOSUPPORT = 16509, - GPG_ERR_ESPIPE = 16510, - GPG_ERR_ESRCH = 16511, - GPG_ERR_ESRMNT = 16512, - GPG_ERR_ESTALE = 16513, - GPG_ERR_ESTRPIPE = 16514, - GPG_ERR_ETIME = 16515, - GPG_ERR_ETIMEDOUT = 16516, - GPG_ERR_ETOOMANYREFS = 16517, - GPG_ERR_ETXTBSY = 16518, - GPG_ERR_EUCLEAN = 16519, - GPG_ERR_EUNATCH = 16520, - GPG_ERR_EUSERS = 16521, - GPG_ERR_EWOULDBLOCK = 16522, - GPG_ERR_EXDEV = 16523, - GPG_ERR_EXFULL = 16524, - - /* 16525 to 32677 are free to be used for more system errors. */ +#define GPG_ERR_SYSTEM_ERROR (1 << 15) + GPG_ERR_E2BIG = GPG_ERR_SYSTEM_ERROR | 0, + GPG_ERR_EACCES = GPG_ERR_SYSTEM_ERROR | 1, + GPG_ERR_EADDRINUSE = GPG_ERR_SYSTEM_ERROR | 2, + GPG_ERR_EADDRNOTAVAIL = GPG_ERR_SYSTEM_ERROR | 3, + GPG_ERR_EADV = GPG_ERR_SYSTEM_ERROR | 4, + GPG_ERR_EAFNOSUPPORT = GPG_ERR_SYSTEM_ERROR | 5, + GPG_ERR_EAGAIN = GPG_ERR_SYSTEM_ERROR | 6, + GPG_ERR_EALREADY = GPG_ERR_SYSTEM_ERROR | 7, + GPG_ERR_EAUTH = GPG_ERR_SYSTEM_ERROR | 8, + GPG_ERR_EBACKGROUND = GPG_ERR_SYSTEM_ERROR | 9, + GPG_ERR_EBADE = GPG_ERR_SYSTEM_ERROR | 10, + GPG_ERR_EBADF = GPG_ERR_SYSTEM_ERROR | 11, + GPG_ERR_EBADFD = GPG_ERR_SYSTEM_ERROR | 12, + GPG_ERR_EBADMSG = GPG_ERR_SYSTEM_ERROR | 13, + GPG_ERR_EBADR = GPG_ERR_SYSTEM_ERROR | 14, + GPG_ERR_EBADRPC = GPG_ERR_SYSTEM_ERROR | 15, + GPG_ERR_EBADRQC = GPG_ERR_SYSTEM_ERROR | 16, + GPG_ERR_EBADSLT = GPG_ERR_SYSTEM_ERROR | 17, + GPG_ERR_EBFONT = GPG_ERR_SYSTEM_ERROR | 18, + GPG_ERR_EBUSY = GPG_ERR_SYSTEM_ERROR | 19, + GPG_ERR_ECANCELED = GPG_ERR_SYSTEM_ERROR | 20, + GPG_ERR_ECHILD = GPG_ERR_SYSTEM_ERROR | 21, + GPG_ERR_ECHRNG = GPG_ERR_SYSTEM_ERROR | 22, + GPG_ERR_ECOMM = GPG_ERR_SYSTEM_ERROR | 23, + GPG_ERR_ECONNABORTED = GPG_ERR_SYSTEM_ERROR | 24, + GPG_ERR_ECONNREFUSED = GPG_ERR_SYSTEM_ERROR | 25, + GPG_ERR_ECONNRESET = GPG_ERR_SYSTEM_ERROR | 26, + GPG_ERR_ED = GPG_ERR_SYSTEM_ERROR | 27, + GPG_ERR_EDEADLK = GPG_ERR_SYSTEM_ERROR | 28, + GPG_ERR_EDEADLOCK = GPG_ERR_SYSTEM_ERROR | 29, + GPG_ERR_EDESTADDRREQ = GPG_ERR_SYSTEM_ERROR | 30, + GPG_ERR_EDIED = GPG_ERR_SYSTEM_ERROR | 31, + GPG_ERR_EDOM = GPG_ERR_SYSTEM_ERROR | 32, + GPG_ERR_EDOTDOT = GPG_ERR_SYSTEM_ERROR | 33, + GPG_ERR_EDQUOT = GPG_ERR_SYSTEM_ERROR | 34, + GPG_ERR_EEXIST = GPG_ERR_SYSTEM_ERROR | 35, + GPG_ERR_EFAULT = GPG_ERR_SYSTEM_ERROR | 36, + GPG_ERR_EFBIG = GPG_ERR_SYSTEM_ERROR | 37, + GPG_ERR_EFTYPE = GPG_ERR_SYSTEM_ERROR | 38, + GPG_ERR_EGRATUITOUS = GPG_ERR_SYSTEM_ERROR | 39, + GPG_ERR_EGREGIOUS = GPG_ERR_SYSTEM_ERROR | 40, + GPG_ERR_EHOSTDOWN = GPG_ERR_SYSTEM_ERROR | 41, + GPG_ERR_EHOSTUNREACH = GPG_ERR_SYSTEM_ERROR | 42, + GPG_ERR_EIDRM = GPG_ERR_SYSTEM_ERROR | 43, + GPG_ERR_EIEIO = GPG_ERR_SYSTEM_ERROR | 44, + GPG_ERR_EILSEQ = GPG_ERR_SYSTEM_ERROR | 45, + GPG_ERR_EINPROGRESS = GPG_ERR_SYSTEM_ERROR | 46, + GPG_ERR_EINTR = GPG_ERR_SYSTEM_ERROR | 47, + GPG_ERR_EINVAL = GPG_ERR_SYSTEM_ERROR | 48, + GPG_ERR_EIO = GPG_ERR_SYSTEM_ERROR | 49, + GPG_ERR_EISCONN = GPG_ERR_SYSTEM_ERROR | 50, + GPG_ERR_EISDIR = GPG_ERR_SYSTEM_ERROR | 51, + GPG_ERR_EISNAM = GPG_ERR_SYSTEM_ERROR | 52, + GPG_ERR_EL2HLT = GPG_ERR_SYSTEM_ERROR | 53, + GPG_ERR_EL2NSYNC = GPG_ERR_SYSTEM_ERROR | 54, + GPG_ERR_EL3HLT = GPG_ERR_SYSTEM_ERROR | 55, + GPG_ERR_EL3RST = GPG_ERR_SYSTEM_ERROR | 56, + GPG_ERR_ELIBACC = GPG_ERR_SYSTEM_ERROR | 57, + GPG_ERR_ELIBBAD = GPG_ERR_SYSTEM_ERROR | 58, + GPG_ERR_ELIBEXEC = GPG_ERR_SYSTEM_ERROR | 59, + GPG_ERR_ELIBMAX = GPG_ERR_SYSTEM_ERROR | 60, + GPG_ERR_ELIBSCN = GPG_ERR_SYSTEM_ERROR | 61, + GPG_ERR_ELNRNG = GPG_ERR_SYSTEM_ERROR | 62, + GPG_ERR_ELOOP = GPG_ERR_SYSTEM_ERROR | 63, + GPG_ERR_EMEDIUMTYPE = GPG_ERR_SYSTEM_ERROR | 64, + GPG_ERR_EMFILE = GPG_ERR_SYSTEM_ERROR | 65, + GPG_ERR_EMLINK = GPG_ERR_SYSTEM_ERROR | 66, + GPG_ERR_EMSGSIZE = GPG_ERR_SYSTEM_ERROR | 67, + GPG_ERR_EMULTIHOP = GPG_ERR_SYSTEM_ERROR | 68, + GPG_ERR_ENAMETOOLONG = GPG_ERR_SYSTEM_ERROR | 69, + GPG_ERR_ENAVAIL = GPG_ERR_SYSTEM_ERROR | 70, + GPG_ERR_ENEEDAUTH = GPG_ERR_SYSTEM_ERROR | 71, + GPG_ERR_ENETDOWN = GPG_ERR_SYSTEM_ERROR | 72, + GPG_ERR_ENETRESET = GPG_ERR_SYSTEM_ERROR | 73, + GPG_ERR_ENETUNREACH = GPG_ERR_SYSTEM_ERROR | 74, + GPG_ERR_ENFILE = GPG_ERR_SYSTEM_ERROR | 75, + GPG_ERR_ENOANO = GPG_ERR_SYSTEM_ERROR | 76, + GPG_ERR_ENOBUFS = GPG_ERR_SYSTEM_ERROR | 77, + GPG_ERR_ENOCSI = GPG_ERR_SYSTEM_ERROR | 78, + GPG_ERR_ENODATA = GPG_ERR_SYSTEM_ERROR | 79, + GPG_ERR_ENODEV = GPG_ERR_SYSTEM_ERROR | 80, + GPG_ERR_ENOENT = GPG_ERR_SYSTEM_ERROR | 81, + GPG_ERR_ENOEXEC = GPG_ERR_SYSTEM_ERROR | 82, + GPG_ERR_ENOLCK = GPG_ERR_SYSTEM_ERROR | 83, + GPG_ERR_ENOLINK = GPG_ERR_SYSTEM_ERROR | 84, + GPG_ERR_ENOMEDIUM = GPG_ERR_SYSTEM_ERROR | 85, + GPG_ERR_ENOMEM = GPG_ERR_SYSTEM_ERROR | 86, + GPG_ERR_ENOMSG = GPG_ERR_SYSTEM_ERROR | 87, + GPG_ERR_ENONET = GPG_ERR_SYSTEM_ERROR | 88, + GPG_ERR_ENOPKG = GPG_ERR_SYSTEM_ERROR | 89, + GPG_ERR_ENOPROTOOPT = GPG_ERR_SYSTEM_ERROR | 90, + GPG_ERR_ENOSPC = GPG_ERR_SYSTEM_ERROR | 91, + GPG_ERR_ENOSR = GPG_ERR_SYSTEM_ERROR | 92, + GPG_ERR_ENOSTR = GPG_ERR_SYSTEM_ERROR | 93, + GPG_ERR_ENOSYS = GPG_ERR_SYSTEM_ERROR | 94, + GPG_ERR_ENOTBLK = GPG_ERR_SYSTEM_ERROR | 95, + GPG_ERR_ENOTCONN = GPG_ERR_SYSTEM_ERROR | 96, + GPG_ERR_ENOTDIR = GPG_ERR_SYSTEM_ERROR | 97, + GPG_ERR_ENOTEMPTY = GPG_ERR_SYSTEM_ERROR | 98, + GPG_ERR_ENOTNAM = GPG_ERR_SYSTEM_ERROR | 99, + GPG_ERR_ENOTSOCK = GPG_ERR_SYSTEM_ERROR | 100, + GPG_ERR_ENOTSUP = GPG_ERR_SYSTEM_ERROR | 101, + GPG_ERR_ENOTTY = GPG_ERR_SYSTEM_ERROR | 102, + GPG_ERR_ENOTUNIQ = GPG_ERR_SYSTEM_ERROR | 103, + GPG_ERR_ENXIO = GPG_ERR_SYSTEM_ERROR | 104, + GPG_ERR_EOPNOTSUPP = GPG_ERR_SYSTEM_ERROR | 105, + GPG_ERR_EOVERFLOW = GPG_ERR_SYSTEM_ERROR | 106, + GPG_ERR_EPERM = GPG_ERR_SYSTEM_ERROR | 107, + GPG_ERR_EPFNOSUPPORT = GPG_ERR_SYSTEM_ERROR | 108, + GPG_ERR_EPIPE = GPG_ERR_SYSTEM_ERROR | 109, + GPG_ERR_EPROCLIM = GPG_ERR_SYSTEM_ERROR | 110, + GPG_ERR_EPROCUNAVAIL = GPG_ERR_SYSTEM_ERROR | 111, + GPG_ERR_EPROGMISMATCH = GPG_ERR_SYSTEM_ERROR | 112, + GPG_ERR_EPROGUNAVAIL = GPG_ERR_SYSTEM_ERROR | 113, + GPG_ERR_EPROTO = GPG_ERR_SYSTEM_ERROR | 114, + GPG_ERR_EPROTONOSUPPORT = GPG_ERR_SYSTEM_ERROR | 115, + GPG_ERR_EPROTOTYPE = GPG_ERR_SYSTEM_ERROR | 116, + GPG_ERR_ERANGE = GPG_ERR_SYSTEM_ERROR | 117, + GPG_ERR_EREMCHG = GPG_ERR_SYSTEM_ERROR | 118, + GPG_ERR_EREMOTE = GPG_ERR_SYSTEM_ERROR | 119, + GPG_ERR_EREMOTEIO = GPG_ERR_SYSTEM_ERROR | 120, + GPG_ERR_ERESTART = GPG_ERR_SYSTEM_ERROR | 121, + GPG_ERR_EROFS = GPG_ERR_SYSTEM_ERROR | 122, + GPG_ERR_ERPCMISMATCH = GPG_ERR_SYSTEM_ERROR | 123, + GPG_ERR_ESHUTDOWN = GPG_ERR_SYSTEM_ERROR | 124, + GPG_ERR_ESOCKTNOSUPPORT = GPG_ERR_SYSTEM_ERROR | 125, + GPG_ERR_ESPIPE = GPG_ERR_SYSTEM_ERROR | 126, + GPG_ERR_ESRCH = GPG_ERR_SYSTEM_ERROR | 127, + GPG_ERR_ESRMNT = GPG_ERR_SYSTEM_ERROR | 128, + GPG_ERR_ESTALE = GPG_ERR_SYSTEM_ERROR | 129, + GPG_ERR_ESTRPIPE = GPG_ERR_SYSTEM_ERROR | 130, + GPG_ERR_ETIME = GPG_ERR_SYSTEM_ERROR | 131, + GPG_ERR_ETIMEDOUT = GPG_ERR_SYSTEM_ERROR | 132, + GPG_ERR_ETOOMANYREFS = GPG_ERR_SYSTEM_ERROR | 133, + GPG_ERR_ETXTBSY = GPG_ERR_SYSTEM_ERROR | 134, + GPG_ERR_EUCLEAN = GPG_ERR_SYSTEM_ERROR | 135, + GPG_ERR_EUNATCH = GPG_ERR_SYSTEM_ERROR | 136, + GPG_ERR_EUSERS = GPG_ERR_SYSTEM_ERROR | 137, + GPG_ERR_EWOULDBLOCK = GPG_ERR_SYSTEM_ERROR | 138, + GPG_ERR_EXDEV = GPG_ERR_SYSTEM_ERROR | 139, + GPG_ERR_EXFULL = GPG_ERR_SYSTEM_ERROR | 140, + + /* GPG_SYSTEM_ERROR | (141 to 32767) are free to be used for more + system errors. */ /* This is one more than the largest allowed entry. */ - GPG_ERR_CODE_DIM = 32768 + GPG_ERR_CODE_DIM = 65536 } gpg_err_code_t; @@ -428,12 +432,11 @@ typedef enum -freg-struct-return option to GCC). */ typedef unsigned int gpg_error_t; -/* We use the lowest 16 bits of gpg_error_t for error codes. The 17th +/* We use the lowest 16 bits of gpg_error_t for error codes. The 16th bit indicates system errors. */ #define GPG_ERR_CODE_MASK (GPG_ERR_CODE_DIM - 1) -#define GPG_ERR_SYSTEM_ERROR 16384 -/* Bits 18 to 24 are reserved. */ +/* Bits 17 to 24 are reserved. */ /* We use the upper 8 bits of gpg_error_t for error sources. */ #define GPG_ERR_SOURCE_MASK (GPG_ERR_SOURCE_DIM - 1) |