[Pcsclite-cvs-commit] CVS libmusclecard/src

CVS User rousseau ludovic.rousseau@free.fr
Tue, 22 Feb 2005 08:38:55 -0700


Update of /cvsroot/pcsclite/libmusclecard/src
In directory haydn:/tmp/cvs-serv26133/src

Modified Files:
	musclecard.c tokenfactory.c 
Log Message:
use dynamic debug level: LogX() instead of DebugLogX()


--- /cvsroot/pcsclite/libmusclecard/src/musclecard.c	2004/10/06 08:46:59	1.45
+++ /cvsroot/pcsclite/libmusclecard/src/musclecard.c	2005/02/22 15:38:54	1.46
@@ -10,7 +10,7 @@
  * You may not remove this header from this file without 
  * prior permission from the author.
  *
- * $Id: musclecard.c,v 1.45 2004/10/06 08:46:59 rousseau Exp $
+ * $Id: musclecard.c,v 1.46 2005/02/22 15:38:54 rousseau Exp $
  */
 
 #include "config.h"
@@ -326,7 +326,7 @@
 	{
 		rv = SCardEstablishContext(SCARD_SCOPE_SYSTEM, 0, 0, &localHContext);
 #ifndef NO_MSC_DEBUG
-		DebugLogB("SCardEstablishContext returns %s",
+		Log2(PCSC_LOG_DEBUG, "SCardEstablishContext returns %s",
 			pcsc_stringify_error(rv));
 #endif
 		if (pcscToMSC(rv) != MSC_SUCCESS)
@@ -354,7 +354,7 @@
 #endif
 
 #ifndef NO_MSC_DEBUG
-	DebugLogB("SCardConnect returns %s", pcsc_stringify_error(rv));
+	Log2(PCSC_LOG_DEBUG, "SCardConnect returns %s", pcsc_stringify_error(rv));
 #endif
 
 	if (pcscToMSC(rv) != MSC_SUCCESS)
@@ -387,7 +387,7 @@
 		&slotNameSize, &slotState, &slotProtocol, tokenId, &tokenIdLength);
 
 #ifndef NO_MSC_DEBUG
-	DebugLogB("SCardStatus returns %s", pcsc_stringify_error(rv));
+	Log2(PCSC_LOG_DEBUG, "SCardStatus returns %s", pcsc_stringify_error(rv));
 #endif
 
 	if (pcscToMSC(rv) != MSC_SUCCESS)
@@ -410,7 +410,7 @@
 		(strcmp(slotName, tokenStruct->slotName) != 0) ||
 		(memcmp(tokenId, tokenStruct->tokenId, tokenIdLength) != 0))
 	{
-		DebugLogA("Internal inconsistent values, ID, slotName");
+		Log1(PCSC_LOG_ERROR, "Internal inconsistent values, ID, slotName");
 		SCardDisconnect(pConnection->hCard, SCARD_LEAVE_CARD);
 		pConnection->hCard = 0;
 		return MSC_INCONSISTENT_STATUS;
@@ -429,7 +429,7 @@
 	rv = TPLoadToken(pConnection);
 
 #ifndef NO_MSC_DEBUG
-	DebugLogB("TPLoadToken returns %s", pcsc_stringify_error(rv));
+	Log2(PCSC_LOG_DEBUG, "TPLoadToken returns %s", pcsc_stringify_error(rv));
 #endif
 
 	if (rv != SCARD_S_SUCCESS)
@@ -447,7 +447,7 @@
 
 	if (vInitFunction == NULL)
 	{
-		DebugLogB("Error: Card service failure: %s",
+		Log2(PCSC_LOG_ERROR, "Error: Card service failure: %s",
 			"InitializePlugin function missing");
 		SCardDisconnect(pConnection->hCard, SCARD_LEAVE_CARD);
 		pConnection->hCard = 0;
@@ -456,7 +456,7 @@
 
 	if (vIdFunction == NULL)
 	{
-		DebugLogB("Error: Card service failure: %s",
+		Log2(PCSC_LOG_ERROR, "Error: Card service failure: %s",
 			"IdentifyToken function missing");
 		SCardDisconnect(pConnection->hCard, SCARD_LEAVE_CARD);
 		pConnection->hCard = 0;
@@ -501,7 +501,7 @@
 		}
 
 #ifndef NO_MSC_DEBUG
-		DebugLogB("MSCIdentifyToken returns %s", msc_error(rv));
+		Log2(PCSC_LOG_DEBUG, "MSCIdentifyToken returns %s", msc_error(rv));
 #endif
 
 		if (rv != MSC_SUCCESS)
@@ -550,7 +550,7 @@
 
 	if (vFunction == NULL)
 	{
-		DebugLogB("Error: Card service failure: %s",
+		Log2(PCSC_LOG_ERROR, "Error: Card service failure: %s",
 			"FinalizePlugin function missing");
 		return MSC_INTERNAL_ERROR;
 	}
@@ -1988,21 +1988,21 @@
 
 	if (vInitFunction == NULL)
 	{
-		DebugLogB("Error: Card service failure: %s",
+		Log2(PCSC_LOG_ERROR, "Error: Card service failure: %s",
 			"InitializePlugin function missing");
 		return MSC_INTERNAL_ERROR;
 	}
 
 	if (vFinFunction == NULL)
 	{
-		DebugLogB("Error: Card service failure: %s",
+		Log2(PCSC_LOG_ERROR, "Error: Card service failure: %s",
 			"FinalizePlugin function missing");
 		return MSC_INTERNAL_ERROR;
 	}
 
 	if (vIdFunction == NULL)
 	{
-		DebugLogB("Error: Card service failure: %s",
+		Log2(PCSC_LOG_ERROR, "Error: Card service failure: %s",
 			"IdentifyToken function missing");
 		return MSC_INTERNAL_ERROR;
 	}
--- /cvsroot/pcsclite/libmusclecard/src/tokenfactory.c	2004/10/06 08:46:59	1.29
+++ /cvsroot/pcsclite/libmusclecard/src/tokenfactory.c	2005/02/22 15:38:55	1.30
@@ -8,7 +8,7 @@
  * Copyright (C) 2004
  *  Ludovic Rousseau <ludovic.rousseau@free.fr>
  *
- * $Id: tokenfactory.c,v 1.29 2004/10/06 08:46:59 rousseau Exp $
+ * $Id: tokenfactory.c,v 1.30 2005/02/22 15:38:55 rousseau Exp $
  */
 
 #include "config.h"
@@ -149,7 +149,7 @@
 
 	if (hpDir == 0)
 	{
-		DebugLogB("Cannot open PC/SC token drivers directory: %s",
+		Log2(PCSC_LOG_ERROR, "Cannot open PC/SC token drivers directory: %s",
 			MSC_SVC_DROPDIR);
 		return -1;
 	}
@@ -159,7 +159,8 @@
 
 	if (hFind == INVALID_HANDLE_VALUE)
 	{
-		DebugLogB("Cannot open PC/SC token drivers directory: %s", findPath);
+		Log2(PCSC_LOG_ERROR, "Cannot open PC/SC token drivers directory: %s",
+			findPath);
 		return -1;
 	}
 #endif
@@ -190,8 +191,8 @@
 			atrIndex = 0;
 
 #ifndef NO_MSC_DEBUG
-			DebugLogB("ATR comparison: FILE: %s", fullPath);
-			DebugLogB("ATR comparison: Target Match: %s", atrString);
+			Log2(PCSC_LOG_DEBUG, "ATR comparison: FILE: %s", fullPath);
+			Log2(PCSC_LOG_DEBUG, "ATR comparison: Target Match: %s", atrString);
 #endif
 
 			while (1)
@@ -204,7 +205,7 @@
 							 * aliases loop */
 				}
 #ifndef NO_MSC_DEBUG
-				DebugLogB("ATR comparison: Source: %s", keyValue);
+				Log2(PCSC_LOG_DEBUG, "ATR comparison: Source: %s", keyValue);
 #endif
 
 				if (strcmp(keyValue, atrString) != 0)
@@ -216,7 +217,7 @@
 					continue;
 				}
 #ifndef NO_MSC_DEBUG
-				DebugLogB("Match found at ATR alias %d", atrIndex);
+				Log2(PCSC_LOG_DEBUG, "Match found at ATR alias %d", atrIndex);
 #endif
 
 				/*
@@ -230,8 +231,8 @@
 						MSC_PRODMSC_KEY_NAME, keyValue, 0);
 					if (rv != 0)
 					{
-						DebugLogA
-							("Match found, failed due to no product name.");
+						Log1(PCSC_LOG_ERROR,
+							"Match found, failed due to no product name.");
 #ifndef WIN32
 						closedir(hpDir);
 #endif
@@ -239,7 +240,7 @@
 					}
 				}
 #ifndef NO_MSC_DEBUG
-				DebugLogB("Product name: %s", keyValue);
+				Log2(PCSC_LOG_DEBUG, "Product name: %s", keyValue);
 #endif
 				strlcpy(tokenInfo->tokenName, keyValue,
 					sizeof(tokenInfo->tokenName));
@@ -255,8 +256,8 @@
 						MSC_LIBRMSC_KEY_NAME, keyValue, 0);
 					if (rv != 0)
 					{
-						DebugLogA
-							("Match found, failed due to no library path.");
+						Log1(PCSC_LOG_ERROR,
+							"Match found, failed due to no library path.");
 #ifndef WIN32
 						closedir(hpDir);
 #endif
@@ -276,7 +277,7 @@
 
 				if (fullLibPath == NULL)
 				{
-					DebugLogA("No path to bundle library found !");
+					Log1(PCSC_LOG_ERROR, "No path to bundle library found !");
 					return -1;
 				}
 
@@ -300,14 +301,14 @@
 				if (rv == 0)
 				{
 #ifndef NO_MSC_DEBUG
-					DebugLogB("Default AID name: %s", keyValue);
+					Log2(PCSC_LOG_DEBUG, "Default AID name: %s", keyValue);
 #endif
 					rv = stringToBytes(keyValue, tokenInfo->tokenApp,
 						&tokenInfo->tokenAppLen);
 					if (rv != 0)
 					{
-						DebugLogA
-							("Match found, failed due to malformed aid string.");
+						Log1(PCSC_LOG_ERROR,
+							"Match found, failed due to malformed aid string.");
 #ifndef WIN32
 						closedir(hpDir);
 #endif
@@ -316,7 +317,7 @@
 
 				} else
 				{
-					DebugLogA("No AID specified in bundle");
+					Log1(PCSC_LOG_ERROR, "No AID specified in bundle");
 					tokenInfo->tokenAppLen = 0;
 				}
 
@@ -377,8 +378,8 @@
 
 	if (rv != 0)
 	{
-		DebugLogA("Error: Matching Token ATR Not Found.");
-		DebugXxd("ATR: ", pConnection->tokenInfo.tokenId,
+		Log1(PCSC_LOG_ERROR, "Error: Matching Token ATR Not Found.");
+		LogXxd(PCSC_LOG_ERROR, "ATR: ", pConnection->tokenInfo.tokenId,
 			pConnection->tokenInfo.tokenIdLength);
 
 		return SCARD_E_CARD_UNSUPPORTED;
@@ -394,12 +395,12 @@
 
 	if (rv != SCARD_S_SUCCESS)
 	{
-		DebugLogA("Error: Could not load service library");
-		DebugLogB("->> %s", pConnection->tokenInfo.svProvider);
+		Log2(PCSC_LOG_ERROR, "Error: Could not load service library %s",
+			pConnection->tokenInfo.svProvider);
 		return SCARD_E_INVALID_TARGET;
 	} else
 	{
-		DebugLogB("Loading service library %s",
+		Log2(PCSC_LOG_INFO, "Loading service library %s",
 			pConnection->tokenInfo.svProvider);
 	}
 
@@ -444,7 +445,7 @@
 	if (rv != SCARD_S_SUCCESS)
 	{
 		pConnection->libPointers.pvfWriteFramework = 0;
-		DebugLogA("Missing functions");
+		Log1(PCSC_LOG_ERROR, "Missing functions");
 		/*
 		 * No big deal - this feature is just not supported 
 		 */
@@ -456,7 +457,7 @@
 	if (rv != SCARD_S_SUCCESS)
 	{
 		pConnection->libPointers.pvfIdentifyToken = 0;
-		DebugLogA("Missing functions");
+		Log1(PCSC_LOG_ERROR, "Missing functions");
 		return SCARD_F_INTERNAL_ERROR;
 	}
 
@@ -467,7 +468,7 @@
 	if (rv != SCARD_S_SUCCESS)
 	{
 		pConnection->libPointers.pvfInitializePlugin = 0;
-		DebugLogA("Missing functions");
+		Log1(PCSC_LOG_ERROR, "Missing functions");
 		return SCARD_F_INTERNAL_ERROR;
 	}
 
@@ -478,7 +479,7 @@
 	if (rv != SCARD_S_SUCCESS)
 	{
 		pConnection->libPointers.pvfFinalizePlugin = 0;
-		DebugLogA("Missing functions");
+		Log1(PCSC_LOG_ERROR, "Missing functions");
 		return SCARD_F_INTERNAL_ERROR;
 	}
 
@@ -488,7 +489,7 @@
 	if (rv != SCARD_S_SUCCESS)
 	{
 		pConnection->libPointers.pvfGetStatus = 0;
-		DebugLogA("Missing functions");
+		Log1(PCSC_LOG_ERROR, "Missing functions");
 		return SCARD_F_INTERNAL_ERROR;
 	}
 
@@ -499,7 +500,7 @@
 	if (rv != SCARD_S_SUCCESS)
 	{
 		pConnection->libPointers.pvfGetCapabilities = 0;
-		DebugLogA("Missing functions");
+		Log1(PCSC_LOG_ERROR, "Missing functions");
 		return SCARD_F_INTERNAL_ERROR;
 	}
 
@@ -510,7 +511,7 @@
 	if (rv != SCARD_S_SUCCESS)
 	{
 		pConnection->libPointers.pvfExtendedFeature = 0;
-		DebugLogA("Missing functions");
+		Log1(PCSC_LOG_ERROR, "Missing functions");
 		/*
 		 * No big deal - there are no extended features 
 		 */
@@ -522,7 +523,7 @@
 	if (rv != SCARD_S_SUCCESS)
 	{
 		pConnection->libPointers.pvfGenerateKeys = 0;
-		DebugLogA("Missing functions");
+		Log1(PCSC_LOG_ERROR, "Missing functions");
 		return SCARD_F_INTERNAL_ERROR;
 	}
 
@@ -532,7 +533,7 @@
 	if (rv != SCARD_S_SUCCESS)
 	{
 		pConnection->libPointers.pvfImportKey = 0;
-		DebugLogA("Missing functions");
+		Log1(PCSC_LOG_ERROR, "Missing functions");
 		return SCARD_F_INTERNAL_ERROR;
 	}
 
@@ -542,7 +543,7 @@
 	if (rv != SCARD_S_SUCCESS)
 	{
 		pConnection->libPointers.pvfExportKey = 0;
-		DebugLogA("Missing functions");
+		Log1(PCSC_LOG_ERROR, "Missing functions");
 		return SCARD_F_INTERNAL_ERROR;
 	}
 
@@ -552,7 +553,7 @@
 	if (rv != SCARD_S_SUCCESS)
 	{
 		pConnection->libPointers.pvfComputeCrypt = 0;
-		DebugLogA("Missing functions");
+		Log1(PCSC_LOG_ERROR, "Missing functions");
 		return SCARD_F_INTERNAL_ERROR;
 	}
 
@@ -563,7 +564,7 @@
 	if (rv != SCARD_S_SUCCESS)
 	{
 		pConnection->libPointers.pvfExtAuthenticate = 0;
-		DebugLogA("Missing functions");
+		Log1(PCSC_LOG_ERROR, "Missing functions");
 		return SCARD_F_INTERNAL_ERROR;
 	}
 
@@ -573,7 +574,7 @@
 	if (rv != SCARD_S_SUCCESS)
 	{
 		pConnection->libPointers.pvfListKeys = 0;
-		DebugLogA("Missing functions");
+		Log1(PCSC_LOG_ERROR, "Missing functions");
 		return SCARD_F_INTERNAL_ERROR;
 	}
 
@@ -583,7 +584,7 @@
 	if (rv != SCARD_S_SUCCESS)
 	{
 		pConnection->libPointers.pvfCreatePIN = 0;
-		DebugLogA("Missing functions");
+		Log1(PCSC_LOG_ERROR, "Missing functions");
 		return SCARD_F_INTERNAL_ERROR;
 	}
 
@@ -593,7 +594,7 @@
 	if (rv != SCARD_S_SUCCESS)
 	{
 		pConnection->libPointers.pvfVerifyPIN = 0;
-		DebugLogA("Missing functions");
+		Log1(PCSC_LOG_ERROR, "Missing functions");
 		return SCARD_F_INTERNAL_ERROR;
 	}
 
@@ -603,7 +604,7 @@
 	if (rv != SCARD_S_SUCCESS)
 	{
 		pConnection->libPointers.pvfChangePIN = 0;
-		DebugLogA("Missing functions");
+		Log1(PCSC_LOG_ERROR, "Missing functions");
 		return SCARD_F_INTERNAL_ERROR;
 	}
 
@@ -613,7 +614,7 @@
 	if (rv != SCARD_S_SUCCESS)
 	{
 		pConnection->libPointers.pvfUnblockPIN = 0;
-		DebugLogA("Missing functions");
+		Log1(PCSC_LOG_ERROR, "Missing functions");
 		return SCARD_F_INTERNAL_ERROR;
 	}
 
@@ -623,7 +624,7 @@
 	if (rv != SCARD_S_SUCCESS)
 	{
 		pConnection->libPointers.pvfListPINs = 0;
-		DebugLogA("Missing functions");
+		Log1(PCSC_LOG_ERROR, "Missing functions");
 		return SCARD_F_INTERNAL_ERROR;
 	}
 
@@ -633,7 +634,7 @@
 	if (rv != SCARD_S_SUCCESS)
 	{
 		pConnection->libPointers.pvfCreateObject = 0;
-		DebugLogA("Missing functions");
+		Log1(PCSC_LOG_ERROR, "Missing functions");
 		return SCARD_F_INTERNAL_ERROR;
 	}
 
@@ -643,7 +644,7 @@
 	if (rv != SCARD_S_SUCCESS)
 	{
 		pConnection->libPointers.pvfDeleteObject = 0;
-		DebugLogA("Missing functions");
+		Log1(PCSC_LOG_ERROR, "Missing functions");
 		return SCARD_F_INTERNAL_ERROR;
 	}
 
@@ -653,7 +654,7 @@
 	if (rv != SCARD_S_SUCCESS)
 	{
 		pConnection->libPointers.pvfWriteObject = 0;
-		DebugLogA("Missing functions");
+		Log1(PCSC_LOG_ERROR, "Missing functions");
 		return SCARD_F_INTERNAL_ERROR;
 	}
 
@@ -663,7 +664,7 @@
 	if (rv != SCARD_S_SUCCESS)
 	{
 		pConnection->libPointers.pvfReadObject = 0;
-		DebugLogA("Missing functions");
+		Log1(PCSC_LOG_ERROR, "Missing functions");
 		return SCARD_F_INTERNAL_ERROR;
 	}
 
@@ -673,7 +674,7 @@
 	if (rv != SCARD_S_SUCCESS)
 	{
 		pConnection->libPointers.pvfListObjects = 0;
-		DebugLogA("Missing functions");
+		Log1(PCSC_LOG_ERROR, "Missing functions");
 		return SCARD_F_INTERNAL_ERROR;
 	}
 
@@ -683,7 +684,7 @@
 	if (rv != SCARD_S_SUCCESS)
 	{
 		pConnection->libPointers.pvfLogoutAll = 0;
-		DebugLogA("Missing functions");
+		Log1(PCSC_LOG_ERROR, "Missing functions");
 		return SCARD_F_INTERNAL_ERROR;
 	}
 
@@ -693,7 +694,7 @@
 	if (rv != SCARD_S_SUCCESS)
 	{
 		pConnection->libPointers.pvfGetChallenge = 0;
-		DebugLogA("Missing functions");
+		Log1(PCSC_LOG_ERROR, "Missing functions");
 		return SCARD_F_INTERNAL_ERROR;
 	}