[Pcsclite-cvs-commit] PCSC/src musclecard.c,1.31,1.32 tokenfactory.c,1.11,1.12
rousseau@quantz.debian.org
rousseau@quantz.debian.org
Sun, 07 Sep 2003 22:36:50 +0200
- Previous message: [Pcsclite-cvs-commit] PCSC/src powermgt_generic.c,NONE,1.1 Makefile.am,1.28,1.29 debuglog.c,1.13,1.14 dyn_hpux.c,1.4,1.5 dyn_macosx.c,1.3,1.4 dyn_unix.c,1.5,1.6 dyn_win32.c,1.4,1.5 powermgt_macosx.c,1.9,1.10 sys_unix.c,1.6,1.7 winscard_msg.c,1.7,1.8
- Next message: [Pcsclite-cvs-commit] muscleTools Makefile,1.5,1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/pcsclite/PCSC/src
In directory quantz:/tmp/cvs-serv24402
Modified Files:
musclecard.c tokenfactory.c
Log Message:
remove useless \n in debug message strings
Index: musclecard.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/musclecard.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- musclecard.c 7 Sep 2003 18:06:58 -0000 1.31
+++ musclecard.c 7 Sep 2003 20:36:48 -0000 1.32
@@ -312,7 +312,7 @@
{
rv = SCardEstablishContext(SCARD_SCOPE_SYSTEM, 0, 0, &localHContext);
#ifdef MSC_DEBUG
- DebugLogB("SCardEstablishContext returns %s\n",
+ DebugLogB("SCardEstablishContext returns %s",
pcsc_stringify_error(rv));
#endif
if (pcscToMSC(rv) != MSC_SUCCESS)
@@ -340,7 +340,7 @@
#endif
#ifdef MSC_DEBUG
- DebugLogB("SCardConnect returns %s\n", pcsc_stringify_error(rv));
+ DebugLogB("SCardConnect returns %s", pcsc_stringify_error(rv));
#endif
if (pcscToMSC(rv) != MSC_SUCCESS)
@@ -373,7 +373,7 @@
&slotNameSize, &slotState, &slotProtocol, tokenId, &tokenIdLength);
#ifdef MSC_DEBUG
- DebugLogB("SCardStatus returns %s\n", pcsc_stringify_error(rv));
+ DebugLogB("SCardStatus returns %s", pcsc_stringify_error(rv));
#endif
if (pcscToMSC(rv) != MSC_SUCCESS)
@@ -396,7 +396,7 @@
(strcmp(slotName, tokenStruct->slotName) != 0) ||
(memcmp(tokenId, tokenStruct->tokenId, tokenIdLength) != 0))
{
- DebugLogA("Internal inconsistent values, ID, slotName\n");
+ DebugLogA("Internal inconsistent values, ID, slotName");
SCardDisconnect(pConnection->hCard, SCARD_LEAVE_CARD);
pConnection->hCard = 0;
return MSC_INCONSISTENT_STATUS;
@@ -415,7 +415,7 @@
rv = TPLoadToken(pConnection);
#ifdef MSC_DEBUG
- DebugLogB("TPLoadToken returns %s\n", pcsc_stringify_error(rv));
+ DebugLogB("TPLoadToken returns %s", pcsc_stringify_error(rv));
#endif
if (rv != SCARD_S_SUCCESS)
@@ -433,7 +433,7 @@
if (vInitFunction == 0)
{
- DebugLogB("Error: Card service failure: %s\n",
+ DebugLogB("Error: Card service failure: %s",
"InitializePlugin function missing");
SCardDisconnect(pConnection->hCard, SCARD_LEAVE_CARD);
pConnection->hCard = 0;
@@ -442,7 +442,7 @@
if (vIdFunction == 0)
{
- DebugLogB("Error: Card service failure: %s\n",
+ DebugLogB("Error: Card service failure: %s",
"IdentifyToken function missing");
SCardDisconnect(pConnection->hCard, SCARD_LEAVE_CARD);
pConnection->hCard = 0;
@@ -487,7 +487,7 @@
}
#ifdef MSC_DEBUG
- DebugLogB("MSCIdentifyToken returns %s\n", msc_error(rv));
+ DebugLogB("MSCIdentifyToken returns %s", msc_error(rv));
#endif
if (rv != MSC_SUCCESS)
@@ -536,7 +536,7 @@
if (vFunction == 0)
{
- DebugLogB("Error: Card service failure: %s\n",
+ DebugLogB("Error: Card service failure: %s",
"FinalizePlugin function missing");
return MSC_INTERNAL_ERROR;
}
@@ -1955,21 +1955,21 @@
if (vInitFunction == 0)
{
- DebugLogB("Error: Card service failure: %s\n",
+ DebugLogB("Error: Card service failure: %s",
"InitializePlugin function missing");
return MSC_INTERNAL_ERROR;
}
if (vFinFunction == 0)
{
- DebugLogB("Error: Card service failure: %s\n",
+ DebugLogB("Error: Card service failure: %s",
"FinalizePlugin function missing");
return MSC_INTERNAL_ERROR;
}
if (vIdFunction == 0)
{
- DebugLogB("Error: Card service failure: %s\n",
+ DebugLogB("Error: Card service failure: %s",
"IdentifyToken function missing");
return MSC_INTERNAL_ERROR;
}
Index: tokenfactory.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/tokenfactory.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- tokenfactory.c 7 Sep 2003 18:06:58 -0000 1.11
+++ tokenfactory.c 7 Sep 2003 20:36:48 -0000 1.12
@@ -157,7 +157,7 @@
if (hFind == INVALID_HANDLE_VALUE)
#endif
{
- DebugLogA("Cannot open PC/SC token drivers directory.\n");
+ DebugLogA("Cannot open PC/SC token drivers directory.");
return -1;
}
@@ -188,8 +188,8 @@
atrIndex = 0;
#ifdef MSC_DEBUG
- DebugLogB("ATR comparison: FILE: %s\n", fullPath);
- DebugLogB("ATR comparison: Target Match: %s\n", atrString);
+ DebugLogB("ATR comparison: FILE: %s", fullPath);
+ DebugLogB("ATR comparison: Target Match: %s", atrString);
#endif
while (1)
@@ -202,7 +202,7 @@
* aliases loop */
}
#ifdef MSC_DEBUG
- DebugLogB("ATR comparison: Source: %s\n", keyValue);
+ DebugLogB("ATR comparison: Source: %s", keyValue);
#endif
if (strcmp(keyValue, atrString) != 0)
@@ -214,7 +214,7 @@
continue;
}
#ifdef MSC_DEBUG
- DebugLogB("Match found at ATR alias %d\n", atrIndex);
+ DebugLogB("Match found at ATR alias %d", atrIndex);
#endif
/*
@@ -229,7 +229,7 @@
if (rv != 0)
{
DebugLogA
- ("Match found, failed due to no product name.\n");
+ ("Match found, failed due to no product name.");
#ifndef WIN32
closedir(hpDir);
#endif
@@ -237,7 +237,7 @@
}
}
#ifdef MSC_DEBUG
- DebugLogB("Product name: %s\n", keyValue);
+ DebugLogB("Product name: %s", keyValue);
#endif
strcpy(tokenInfo->tokenName, keyValue);
@@ -253,7 +253,7 @@
if (rv != 0)
{
DebugLogA
- ("Match found, failed due to no library path.\n");
+ ("Match found, failed due to no library path.");
#ifndef WIN32
closedir(hpDir);
#endif
@@ -273,7 +273,7 @@
if (fullLibPath == NULL)
{
- DebugLogA("No path to bundle library found !\n");
+ DebugLogA("No path to bundle library found !");
return -1;
}
@@ -296,14 +296,14 @@
if (rv == 0)
{
#ifdef MSC_DEBUG
- DebugLogB("Default AID name: %s\n", keyValue);
+ DebugLogB("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.\n");
+ ("Match found, failed due to malformed aid string.");
#ifndef WIN32
closedir(hpDir);
#endif
@@ -312,7 +312,7 @@
} else
{
- DebugLogA("No AID specified in bundle\n");
+ DebugLogA("No AID specified in bundle");
tokenInfo->tokenAppLen = 0;
}
@@ -374,7 +374,7 @@
if (rv != 0)
{
- DebugLogA("Error: Matching Token ATR Not Found.\n");
+ DebugLogA("Error: Matching Token ATR Not Found.");
DebugXxd("ATR : ", pConnection->tokenInfo.tokenId,
pConnection->tokenInfo.tokenIdLength);
@@ -391,12 +391,12 @@
if (rv != SCARD_S_SUCCESS)
{
- DebugLogA("Error: Could not load service library\n");
- DebugLogB("->> %s\n", pConnection->tokenInfo.svProvider);
+ DebugLogA("Error: Could not load service library");
+ DebugLogB("->> %s", pConnection->tokenInfo.svProvider);
return SCARD_E_INVALID_TARGET;
} else
{
- DebugLogB("Loading service library %s\n",
+ DebugLogB("Loading service library %s",
pConnection->tokenInfo.svProvider);
}
- Previous message: [Pcsclite-cvs-commit] PCSC/src powermgt_generic.c,NONE,1.1 Makefile.am,1.28,1.29 debuglog.c,1.13,1.14 dyn_hpux.c,1.4,1.5 dyn_macosx.c,1.3,1.4 dyn_unix.c,1.5,1.6 dyn_win32.c,1.4,1.5 powermgt_macosx.c,1.9,1.10 sys_unix.c,1.6,1.7 winscard_msg.c,1.7,1.8
- Next message: [Pcsclite-cvs-commit] muscleTools Makefile,1.5,1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]