[Pcsclite-cvs-commit] r5293 - in /trunk/PCSC/src: readerfactory.c winscard_clnt.c winscard_svc.c
rousseau at users.alioth.debian.org
rousseau at users.alioth.debian.org
Mon Oct 11 08:15:36 UTC 2010
Author: rousseau
Date: Mon Oct 11 08:15:34 2010
New Revision: 5293
URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5293
Log:
list_* functions return an decimal integer so use %d insteaf of %X to
log the error value.
Modified:
trunk/PCSC/src/readerfactory.c
trunk/PCSC/src/winscard_clnt.c
trunk/PCSC/src/winscard_svc.c
Modified: trunk/PCSC/src/readerfactory.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/readerfactory.c?rev=5293&op=diff
==============================================================================
--- trunk/PCSC/src/readerfactory.c (original)
+++ trunk/PCSC/src/readerfactory.c Mon Oct 11 08:15:34 2010
@@ -191,7 +191,7 @@
lrv = list_init(&((sReadersContexts[dwContext])->handlesList));
if (lrv < 0)
{
- Log2(PCSC_LOG_CRITICAL, "list_init failed with return value: %X", lrv);
+ Log2(PCSC_LOG_CRITICAL, "list_init failed with return value: %d", lrv);
return SCARD_E_NO_MEMORY;
}
@@ -200,7 +200,7 @@
if (lrv < 0)
{
Log2(PCSC_LOG_CRITICAL,
- "list_attributes_seeker failed with return value: %X", lrv);
+ "list_attributes_seeker failed with return value: %d", lrv);
return SCARD_E_NO_MEMORY;
}
@@ -381,7 +381,7 @@
lrv = list_init(&((sReadersContexts[dwContextB])->handlesList));
if (lrv < 0)
{
- Log2(PCSC_LOG_CRITICAL, "list_init failed with return value: %X", lrv);
+ Log2(PCSC_LOG_CRITICAL, "list_init failed with return value: %d", lrv);
return SCARD_E_NO_MEMORY;
}
@@ -390,7 +390,7 @@
if (lrv < 0)
{
Log2(PCSC_LOG_CRITICAL,
- "list_attributes_seeker failed with return value: %X", lrv);
+ "list_attributes_seeker failed with return value: %d", lrv);
return SCARD_E_NO_MEMORY;
}
@@ -518,7 +518,7 @@
lrv = list_delete_at(&(sContext->handlesList), 0);
if (lrv < 0)
Log2(PCSC_LOG_CRITICAL,
- "list_delete_at failed with return value: %X", lrv);
+ "list_delete_at failed with return value: %d", lrv);
free(currentHandle);
}
@@ -1134,7 +1134,7 @@
if (lrv < 0)
{
free(newHandle);
- Log2(PCSC_LOG_CRITICAL, "list_append failed with return value: %X",
+ Log2(PCSC_LOG_CRITICAL, "list_append failed with return value: %d",
lrv);
rv = SCARD_E_NO_MEMORY;
}
@@ -1161,7 +1161,7 @@
lrv = list_delete(&(rContext->handlesList), currentHandle);
if (lrv < 0)
Log2(PCSC_LOG_CRITICAL,
- "list_delete failed with return value: %X", lrv);
+ "list_delete failed with return value: %d", lrv);
free(currentHandle);
Modified: trunk/PCSC/src/winscard_clnt.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_clnt.c?rev=5293&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_clnt.c (original)
+++ trunk/PCSC/src/winscard_clnt.c Mon Oct 11 08:15:34 2010
@@ -540,7 +540,7 @@
lrv = list_init(&contextMapList);
if (lrv < 0)
{
- Log2(PCSC_LOG_CRITICAL, "list_init failed with return value: %X", lrv);
+ Log2(PCSC_LOG_CRITICAL, "list_init failed with return value: %d", lrv);
return SCARD_E_NO_MEMORY;
}
@@ -549,7 +549,7 @@
if (lrv <0)
{
Log2(PCSC_LOG_CRITICAL,
- "list_attributes_seeker failed with return value: %X", lrv);
+ "list_attributes_seeker failed with return value: %d", lrv);
list_destroy(&contextMapList);
return SCARD_E_NO_MEMORY;
}
@@ -3469,7 +3469,7 @@
lrv = list_init(&(newContextMap->channelMapList));
if (lrv < 0)
{
- Log2(PCSC_LOG_CRITICAL, "list_init failed with return value: %X", lrv);
+ Log2(PCSC_LOG_CRITICAL, "list_init failed with return value: %d", lrv);
goto error;
}
@@ -3478,7 +3478,7 @@
if (lrv <0)
{
Log2(PCSC_LOG_CRITICAL,
- "list_attributes_seeker failed with return value: %X", lrv);
+ "list_attributes_seeker failed with return value: %d", lrv);
list_destroy(&(newContextMap->channelMapList));
goto error;
}
@@ -3486,7 +3486,7 @@
lrv = list_append(&contextMapList, newContextMap);
if (lrv < 0)
{
- Log2(PCSC_LOG_CRITICAL, "list_append failed with return value: %X",
+ Log2(PCSC_LOG_CRITICAL, "list_append failed with return value: %d",
lrv);
list_destroy(&(newContextMap->channelMapList));
goto error;
@@ -3600,7 +3600,7 @@
if (lrv < 0)
{
Log2(PCSC_LOG_CRITICAL,
- "list_delete failed with return value: %X", lrv);
+ "list_delete failed with return value: %d", lrv);
}
free(targetContextMap);
@@ -3630,7 +3630,7 @@
{
free(newChannelMap->readerName);
free(newChannelMap);
- Log2(PCSC_LOG_CRITICAL, "list_append failed with return value: %X", lrv);
+ Log2(PCSC_LOG_CRITICAL, "list_append failed with return value: %d", lrv);
return SCARD_E_NO_MEMORY;
}
@@ -3655,7 +3655,7 @@
if (lrv < 0)
{
Log2(PCSC_LOG_CRITICAL,
- "list_delete failed with return value: %X", lrv);
+ "list_delete failed with return value: %d", lrv);
}
free(currentChannelMap);
Modified: trunk/PCSC/src/winscard_svc.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_svc.c?rev=5293&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_svc.c (original)
+++ trunk/PCSC/src/winscard_svc.c Mon Oct 11 08:15:34 2010
@@ -104,13 +104,13 @@
lrv = list_init(&contextsList);
if (lrv < 0)
{
- Log2(PCSC_LOG_CRITICAL, "list_init failed with return value: %X", lrv);
+ Log2(PCSC_LOG_CRITICAL, "list_init failed with return value: %d", lrv);
return -1;
}
lrv = list_attributes_seeker(& contextsList, contextsListhContext_seeker);
if (lrv < 0)
{
- Log2(PCSC_LOG_CRITICAL, "list_attributes_seeker failed with return value: %X", lrv);
+ Log2(PCSC_LOG_CRITICAL, "list_attributes_seeker failed with return value: %d", lrv);
return -1;
}
@@ -169,7 +169,7 @@
lrv = list_init(&(newContext->cardsList));
if (lrv < 0)
{
- Log2(PCSC_LOG_CRITICAL, "list_init failed with return value: %X", lrv);
+ Log2(PCSC_LOG_CRITICAL, "list_init failed with return value: %d", lrv);
goto error;
}
@@ -184,7 +184,7 @@
lrv = list_attributes_comparator(&(newContext->cardsList), list_comparator_int32_t);
if (lrv != 0)
{
- Log2(PCSC_LOG_CRITICAL, "list_attributes_comparator failed with return value: %X", lrv);
+ Log2(PCSC_LOG_CRITICAL, "list_attributes_comparator failed with return value: %d", lrv);
list_destroy(&(newContext->cardsList));
goto error;
}
@@ -196,7 +196,7 @@
(void)pthread_mutex_unlock(&contextsList_lock);
if (lrv < 0)
{
- Log2(PCSC_LOG_CRITICAL, "list_append failed with return value: %X", lrv);
+ Log2(PCSC_LOG_CRITICAL, "list_append failed with return value: %d", lrv);
list_destroy(&(newContext->cardsList));
goto error;
}
@@ -212,7 +212,7 @@
lrv2 = list_delete(&contextsList, newContext);
(void)pthread_mutex_unlock(&contextsList_lock);
if (lrv2 < 0)
- Log2(PCSC_LOG_CRITICAL, "list_delete failed with error %X", lrv2);
+ Log2(PCSC_LOG_CRITICAL, "list_delete failed with error %d", lrv2);
list_destroy(&(newContext->cardsList));
goto error;
}
@@ -835,7 +835,7 @@
lrv = list_delete_at(&(threadContext->cardsList), 0);
if (lrv < 0)
Log2(PCSC_LOG_CRITICAL,
- "list_delete_at failed with return value: %X", lrv);
+ "list_delete_at failed with return value: %d", lrv);
}
(void)pthread_mutex_unlock(&threadContext->cardsList_lock);
list_destroy(&(threadContext->cardsList));
@@ -871,7 +871,7 @@
(void)pthread_mutex_unlock(&threadContext->cardsList_lock);
if (lrv < 0)
{
- Log2(PCSC_LOG_CRITICAL, "list_append failed with return value: %X",
+ Log2(PCSC_LOG_CRITICAL, "list_append failed with return value: %d",
lrv);
return SCARD_E_NO_MEMORY;
}
@@ -890,7 +890,7 @@
(void)pthread_mutex_unlock(&threadContext->cardsList_lock);
if (lrv < 0)
{
- Log2(PCSC_LOG_CRITICAL, "list_delete failed with error %X", lrv);
+ Log2(PCSC_LOG_CRITICAL, "list_delete failed with error %d", lrv);
return SCARD_E_INVALID_VALUE;
}
More information about the Pcsclite-cvs-commit
mailing list