diff options
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | src/err-codes.h.in | 16 | ||||
| -rw-r--r-- | src/err-sources.h.in | 4 | ||||
| -rw-r--r-- | src/gpg-error.h | 46 |
4 files changed, 72 insertions, 11 deletions
@@ -1,3 +1,20 @@ +2003-06-04 Marcus Brinkmann <[email protected]> + + * src/gpg-error.h (gpg_err_source_t): Add GPG_ERR_SOURCE_USER_1 to + GPG_ERR_SOURCE_USER_4. + (gpg_err_code_t): Add GPG_ERR_USER_1 to GPG_ERR_USER_16. + * src/err-sources.h.in: Likewise. + * src/err-codes.h.in: Likewise. + + * src/gpg-error.h: Rename GPG_ERR_INVALID_RESPONSE to + GPG_ERR_INV_RESPONSE, GPG_ERR_INVALID_CARD to GPG_ERR_INV_CARD, + GPG_ERR_INVALID_INDEX to GPG_ERR_INV_INDEX, GPG_ERR_INVALID_ID to + GPG_ERR_INV_ID, GPG_ERR_AGENT_ERROR to GPG_ERR_AGENT, + GPG_ERR_ASSUAN_ERROR to GPG_ERR_ASSUAN, GPG_ERR_PIN_ENTRY_ERROR to + GPG_ERR_PIN_ENTRY, GPG_ERR_DIRMNGR_ERROR to GPG_ERR_DIRMNGR, + GPG_ERR_CARD_ERROR to GPG_ERR_CARD, GPG_ERR_CONFIGURATION_ERROR to + GPG_ERR_CONFIGURATION, GPG_ERR_SCDAEMON_ERROR to GPG_ERR_SCDAEMON. + 2003-06-02 Moritz Schulte <[email protected]> * src/gpg-error.h: Fix description of gpg_err_code_to_errno diff --git a/src/err-codes.h.in b/src/err-codes.h.in index 109fe79..9105195 100644 --- a/src/err-codes.h.in +++ b/src/err-codes.h.in @@ -153,6 +153,22 @@ 211 Bad hexadecimal character in S-expression 212 Odd hexadecimal numbers in S-expression 213 Bad octadecimal character in S-expression +1024 User defined error code 1 +1025 User defined error code 2 +1026 User defined error code 3 +1027 User defined error code 4 +1028 User defined error code 5 +1029 User defined error code 6 +1030 User defined error code 7 +1031 User defined error code 8 +1032 User defined error code 9 +1033 User defined error code 10 +1034 User defined error code 11 +1035 User defined error code 12 +1036 User defined error code 13 +1037 User defined error code 14 +1038 User defined error code 15 +1039 User defined error code 16 16382 Unknown system error 16383 End of file Unknown error code diff --git a/src/err-sources.h.in b/src/err-sources.h.in index 9e3b7e8..6816bc6 100644 --- a/src/err-sources.h.in +++ b/src/err-sources.h.in @@ -35,4 +35,8 @@ 5 Pinentry 6 SCD 7 GPGME +32 User defined source 1 +33 User defined source 2 +34 User defined source 3 +35 User defined source 4 Unknown source diff --git a/src/gpg-error.h b/src/gpg-error.h index f2f07f2..23c0a50 100644 --- a/src/gpg-error.h +++ b/src/gpg-error.h @@ -60,6 +60,12 @@ typedef enum GPG_ERR_SOURCE_SCD = 6, GPG_ERR_SOURCE_GPGME = 7, + /* Free for use by non-GnuPG components. */ + GPG_ERR_SOURCE_USER_1 = 32, + GPG_ERR_SOURCE_USER_2 = 33, + GPG_ERR_SOURCE_USER_3 = 34, + GPG_ERR_SOURCE_USER_4 = 35, + /* This is one more than the largest allowed entry. */ GPG_ERR_SOURCE_DIM = 256 } gpg_err_source_t; @@ -144,17 +150,17 @@ typedef enum /* Codes 73 and 74 are unused. */ GPG_ERR_INCOMPLETE_LINE = 75, - GPG_ERR_INVALID_RESPONSE = 76, + GPG_ERR_INV_RESPONSE = 76, GPG_ERR_NO_AGENT = 77, - GPG_ERR_AGENT_ERROR = 78, + GPG_ERR_AGENT = 78, GPG_ERR_INV_DATA = 79, GPG_ERR_ASSUAN_SERVER_FAULT = 80, - GPG_ERR_ASSUAN_ERROR = 81, /* Catch all assuan error. */ + GPG_ERR_ASSUAN = 81, /* Catch all assuan error. */ GPG_ERR_INV_SESSION_KEY = 82, GPG_ERR_INV_SEXP = 83, GPG_ERR_UNSUPPORTED_ALGORITHM = 84, GPG_ERR_NO_PIN_ENTRY = 85, - GPG_ERR_PIN_ENTRY_ERROR = 86, + GPG_ERR_PIN_ENTRY = 86, GPG_ERR_BAD_PIN = 87, GPG_ERR_INV_NAME = 88, GPG_ERR_BAD_DATA = 89, @@ -163,7 +169,7 @@ typedef enum /* Code 91 is free. */ GPG_ERR_NO_DIRMNGR = 92, - GPG_ERR_DIRMNGR_ERROR = 93, + GPG_ERR_DIRMNGR = 93, GPG_ERR_CERT_REVOKED = 94, GPG_ERR_NO_CRL_KNOWN = 95, GPG_ERR_CRL_TOO_OLD = 96, @@ -178,19 +184,19 @@ typedef enum GPG_ERR_UNSUPPORTED_PROTECTION = 105, GPG_ERR_CORRUPTED_PROTECTION = 106, GPG_ERR_AMBIGUOUS_NAME = 107, - GPG_ERR_CARD_ERROR = 108, + GPG_ERR_CARD = 108, GPG_ERR_CARD_RESET = 109, GPG_ERR_CARD_REMOVED = 110, - GPG_ERR_INVALID_CARD = 111, + GPG_ERR_INV_CARD = 111, GPG_ERR_CARD_NOT_PRESENT = 112, GPG_ERR_NO_PKCS15_APP = 113, GPG_ERR_NOT_CONFIRMED = 114, - GPG_ERR_CONFIGURATION_ERROR = 115, + GPG_ERR_CONFIGURATION = 115, GPG_ERR_NO_POLICY_MATCH = 116, - GPG_ERR_INVALID_INDEX = 117, - GPG_ERR_INVALID_ID = 118, + GPG_ERR_INV_INDEX = 117, + GPG_ERR_INV_ID = 118, GPG_ERR_NO_SCDAEMON = 119, - GPG_ERR_SCDAEMON_ERROR = 120, + GPG_ERR_SCDAEMON = 120, GPG_ERR_UNSUPPORTED_PROTOCOL = 121, GPG_ERR_BAD_PIN_METHOD = 122, GPG_ERR_CARD_NOT_INITIALIZED = 123, @@ -212,6 +218,24 @@ typedef enum GPG_ERR_SEXP_ODD_HEX_NUMBERS = 212, GPG_ERR_SEXP_BAD_OCT_CHAR = 213, + /* For free use by non-GnuPG components. */ + GPG_ERR_USER_1 = 1024, + GPG_ERR_USER_2 = 1025, + GPG_ERR_USER_3 = 1026, + GPG_ERR_USER_4 = 1027, + GPG_ERR_USER_5 = 1028, + GPG_ERR_USER_6 = 1029, + GPG_ERR_USER_7 = 1030, + GPG_ERR_USER_8 = 1031, + GPG_ERR_USER_9 = 1032, + GPG_ERR_USER_10 = 1033, + GPG_ERR_USER_11 = 1034, + GPG_ERR_USER_12 = 1035, + GPG_ERR_USER_13 = 1036, + GPG_ERR_USER_14 = 1037, + GPG_ERR_USER_15 = 1038, + GPG_ERR_USER_16 = 1039, + GPG_ERR_UNKNOWN_ERRNO = 16382, GPG_ERR_EOF = 16383, /* This was once a -1. Pity. */ |