[Pcsclite-cvs-commit] r4573 - /trunk/PCSC/src/error.c
rousseau at users.alioth.debian.org
rousseau at users.alioth.debian.org
Thu Nov 26 20:00:53 UTC 2009
Author: rousseau
Date: Thu Nov 26 20:00:52 2009
New Revision: 4573
URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4573
Log:
reorder error codes
Modified:
trunk/PCSC/src/error.c
Modified: trunk/PCSC/src/error.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/error.c?rev=4573&op=diff
==============================================================================
--- trunk/PCSC/src/error.c (original)
+++ trunk/PCSC/src/error.c Thu Nov 26 20:00:52 2009
@@ -52,75 +52,113 @@
case SCARD_S_SUCCESS:
(void)strlcpy(strError, "Command successful.", sizeof(strError));
break;
+ case SCARD_F_INTERNAL_ERROR:
+ (void)strlcpy(strError, "Internal error.", sizeof(strError));
+ break;
case SCARD_E_CANCELLED:
(void)strlcpy(strError, "Command cancelled.", sizeof(strError));
break;
+ case SCARD_E_INVALID_HANDLE:
+ (void)strlcpy(strError, "Invalid handle.", sizeof(strError));
+ break;
+ case SCARD_E_INVALID_PARAMETER:
+ (void)strlcpy(strError, "Invalid parameter given.", sizeof(strError));
+ break;
+ case SCARD_E_INVALID_TARGET:
+ (void)strlcpy(strError, "Invalid target given.", sizeof(strError));
+ break;
+ case SCARD_E_NO_MEMORY:
+ (void)strlcpy(strError, "Not enough memory.", sizeof(strError));
+ break;
+ case SCARD_F_WAITED_TOO_LONG:
+ (void)strlcpy(strError, "Waited too long.", sizeof(strError));
+ break;
+ case SCARD_E_INSUFFICIENT_BUFFER:
+ (void)strlcpy(strError, "Insufficient buffer.", sizeof(strError));
+ break;
+ case SCARD_E_UNKNOWN_READER:
+ (void)strlcpy(strError, "Unknown reader specified.", sizeof(strError));
+ break;
+ case SCARD_E_TIMEOUT:
+ (void)strlcpy(strError, "Command timeout.", sizeof(strError));
+ break;
+ case SCARD_E_SHARING_VIOLATION:
+ (void)strlcpy(strError, "Sharing violation.", sizeof(strError));
+ break;
+ case SCARD_E_NO_SMARTCARD:
+ (void)strlcpy(strError, "No smart card inserted.", sizeof(strError));
+ break;
+ case SCARD_E_UNKNOWN_CARD:
+ (void)strlcpy(strError, "Unknown card.", sizeof(strError));
+ break;
case SCARD_E_CANT_DISPOSE:
(void)strlcpy(strError, "Cannot dispose handle.", sizeof(strError));
break;
- case SCARD_E_INSUFFICIENT_BUFFER:
- (void)strlcpy(strError, "Insufficient buffer.", sizeof(strError));
+ case SCARD_E_PROTO_MISMATCH:
+ (void)strlcpy(strError, "Card protocol mismatch.", sizeof(strError));
+ break;
+ case SCARD_E_NOT_READY:
+ (void)strlcpy(strError, "Subsystem not ready.", sizeof(strError));
+ break;
+ case SCARD_E_INVALID_VALUE:
+ (void)strlcpy(strError, "Invalid value given.", sizeof(strError));
+ break;
+ case SCARD_E_SYSTEM_CANCELLED:
+ (void)strlcpy(strError, "System cancelled.", sizeof(strError));
+ break;
+ case SCARD_F_COMM_ERROR:
+ (void)strlcpy(strError, "RPC transport error.", sizeof(strError));
+ break;
+ case SCARD_F_UNKNOWN_ERROR:
+ (void)strlcpy(strError, "Unknown error.", sizeof(strError));
break;
case SCARD_E_INVALID_ATR:
(void)strlcpy(strError, "Invalid ATR.", sizeof(strError));
break;
- case SCARD_E_INVALID_HANDLE:
- (void)strlcpy(strError, "Invalid handle.", sizeof(strError));
- break;
- case SCARD_E_INVALID_PARAMETER:
- (void)strlcpy(strError, "Invalid parameter given.", sizeof(strError));
- break;
- case SCARD_E_INVALID_TARGET:
- (void)strlcpy(strError, "Invalid target given.", sizeof(strError));
- break;
- case SCARD_E_INVALID_VALUE:
- (void)strlcpy(strError, "Invalid value given.", sizeof(strError));
- break;
- case SCARD_E_NO_MEMORY:
- (void)strlcpy(strError, "Not enough memory.", sizeof(strError));
- break;
- case SCARD_F_COMM_ERROR:
- (void)strlcpy(strError, "RPC transport error.", sizeof(strError));
- break;
- case SCARD_F_INTERNAL_ERROR:
- (void)strlcpy(strError, "Internal error.", sizeof(strError));
- break;
- case SCARD_F_UNKNOWN_ERROR:
- (void)strlcpy(strError, "Unknown error.", sizeof(strError));
- break;
- case SCARD_F_WAITED_TOO_LONG:
- (void)strlcpy(strError, "Waited too long.", sizeof(strError));
- break;
- case SCARD_E_UNKNOWN_READER:
- (void)strlcpy(strError, "Unknown reader specified.", sizeof(strError));
- break;
- case SCARD_E_TIMEOUT:
- (void)strlcpy(strError, "Command timeout.", sizeof(strError));
- break;
- case SCARD_E_SHARING_VIOLATION:
- (void)strlcpy(strError, "Sharing violation.", sizeof(strError));
- break;
- case SCARD_E_NO_SMARTCARD:
- (void)strlcpy(strError, "No smart card inserted.", sizeof(strError));
- break;
- case SCARD_E_UNKNOWN_CARD:
- (void)strlcpy(strError, "Unknown card.", sizeof(strError));
- break;
- case SCARD_E_PROTO_MISMATCH:
- (void)strlcpy(strError, "Card protocol mismatch.", sizeof(strError));
- break;
- case SCARD_E_NOT_READY:
- (void)strlcpy(strError, "Subsystem not ready.", sizeof(strError));
- break;
- case SCARD_E_SYSTEM_CANCELLED:
- (void)strlcpy(strError, "System cancelled.", sizeof(strError));
- break;
case SCARD_E_NOT_TRANSACTED:
(void)strlcpy(strError, "Transaction failed.", sizeof(strError));
break;
case SCARD_E_READER_UNAVAILABLE:
(void)strlcpy(strError, "Reader is unavailable.", sizeof(strError));
break;
+ /* case SCARD_P_SHUTDOWN: */
+ case SCARD_E_PCI_TOO_SMALL:
+ (void)strlcpy(strError, "PCI struct too small.", sizeof(strError));
+ break;
+ case SCARD_E_READER_UNSUPPORTED:
+ (void)strlcpy(strError, "Reader is unsupported.", sizeof(strError));
+ break;
+ case SCARD_E_DUPLICATE_READER:
+ (void)strlcpy(strError, "Reader already exists.", sizeof(strError));
+ break;
+ case SCARD_E_CARD_UNSUPPORTED:
+ (void)strlcpy(strError, "Card is unsupported.", sizeof(strError));
+ break;
+ case SCARD_E_NO_SERVICE:
+ (void)strlcpy(strError, "Service not available.", sizeof(strError));
+ break;
+ case SCARD_E_SERVICE_STOPPED:
+ (void)strlcpy(strError, "Service was stopped.", sizeof(strError));
+ break;
+ /* case SCARD_E_UNEXPECTED: */
+ /* case SCARD_E_ICC_CREATEORDER: */
+ /* case SCARD_E_UNSUPPORTED_FEATURE: */
+ /* case SCARD_E_DIR_NOT_FOUND: */
+ /* case SCARD_E_NO_DIR: */
+ /* case SCARD_E_NO_FILE: */
+ /* case SCARD_E_NO_ACCESS: */
+ /* case SCARD_E_WRITE_TOO_MANY: */
+ /* case SCARD_E_BAD_SEEK: */
+ /* case SCARD_E_INVALID_CHV: */
+ /* case SCARD_E_UNKNOWN_RES_MNG: */
+ /* case SCARD_E_NO_SUCH_CERTIFICATE: */
+ /* case SCARD_E_CERTIFICATE_UNAVAILABLE: */
+ case SCARD_E_NO_READERS_AVAILABLE:
+ (void)strlcpy(strError, "Cannot find a smart card reader.", sizeof(strError));
+ break;
+ /* case SCARD_E_COMM_DATA_LOST: */
+ /* case SCARD_E_NO_KEY_CONTAINER: */
+ /* case SCARD_E_SERVER_TOO_BUSY: */
case SCARD_W_UNSUPPORTED_CARD:
(void)strlcpy(strError, "Card is not supported.", sizeof(strError));
break;
@@ -136,32 +174,18 @@
case SCARD_W_REMOVED_CARD:
(void)strlcpy(strError, "Card was removed.", sizeof(strError));
break;
+ /* case SCARD_W_SECURITY_VIOLATION: */
+ /* case SCARD_W_WRONG_CHV: */
+ /* case SCARD_W_CHV_BLOCKED: */
+ /* case SCARD_W_EOF: */
+ /* case SCARD_W_CANCELLED_BY_USER: */
+ /* case SCARD_W_CARD_NOT_AUTHENTICATED: */
+
case SCARD_W_INSERTED_CARD:
(void)strlcpy(strError, "Card was inserted.", sizeof(strError));
break;
case SCARD_E_UNSUPPORTED_FEATURE:
(void)strlcpy(strError, "Feature not supported.", sizeof(strError));
- break;
- case SCARD_E_PCI_TOO_SMALL:
- (void)strlcpy(strError, "PCI struct too small.", sizeof(strError));
- break;
- case SCARD_E_READER_UNSUPPORTED:
- (void)strlcpy(strError, "Reader is unsupported.", sizeof(strError));
- break;
- case SCARD_E_DUPLICATE_READER:
- (void)strlcpy(strError, "Reader already exists.", sizeof(strError));
- break;
- case SCARD_E_CARD_UNSUPPORTED:
- (void)strlcpy(strError, "Card is unsupported.", sizeof(strError));
- break;
- case SCARD_E_NO_SERVICE:
- (void)strlcpy(strError, "Service not available.", sizeof(strError));
- break;
- case SCARD_E_SERVICE_STOPPED:
- (void)strlcpy(strError, "Service was stopped.", sizeof(strError));
- break;
- case SCARD_E_NO_READERS_AVAILABLE:
- (void)strlcpy(strError, "Cannot find a smart card reader.", sizeof(strError));
break;
default:
(void)snprintf(strError, sizeof(strError)-1, "Unkown error: 0x%08lX",
More information about the Pcsclite-cvs-commit
mailing list