[Pcsclite-cvs-commit] Drivers/ccid/src ccid_serial.c,1.8,1.9 ccid_usb.c,1.20,1.21
rousseau@haydn.debian.org
rousseau@haydn.debian.org
Update of /cvsroot/pcsclite/Drivers/ccid/src
In directory haydn:/tmp/cvs-serv24045/src
Modified Files:
ccid_serial.c ccid_usb.c
Log Message:
add { } to avoid ambiguities now that DEBUG_* are "if (x) y" constructions
Index: ccid_serial.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/ccid_serial.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ccid_serial.c 12 Feb 2004 16:09:32 -0000 1.8
+++ ccid_serial.c 6 Apr 2004 13:15:34 -0000 1.9
@@ -229,12 +229,18 @@
return rv;
if (c == CARD_ABSENT)
+ {
DEBUG_COMM("Card removed");
+ }
else
if (c == CARD_PRESENT)
+ {
DEBUG_COMM("Card inserted");
+ }
else
+ {
DEBUG_COMM2("Unknown card movement: %d", buffer[3]);
+ }
goto start;
sync:
Index: ccid_usb.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/ccid_usb.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- ccid_usb.c 5 Apr 2004 09:47:21 -0000 1.20
+++ ccid_usb.c 6 Apr 2004 13:15:34 -0000 1.21
@@ -160,7 +160,9 @@
/* general driver info */
if (!LTPBundleFindValueWithKey(infofile, "ifdManufacturerString", keyValue, 0))
+ {
DEBUG_CRITICAL2("Manufacturer: %s", keyValue);
+ }
else
{
DEBUG_CRITICAL2("LTPBundleFindValueWithKey error. Can't find %s?",
@@ -168,11 +170,15 @@
return STATUS_UNSUCCESSFUL;
}
if (!LTPBundleFindValueWithKey(infofile, "ifdProductString", keyValue, 0))
+ {
DEBUG_CRITICAL2("ProductString: %s", keyValue);
+ }
else
return STATUS_UNSUCCESSFUL;
if (!LTPBundleFindValueWithKey(infofile, "Copyright", keyValue, 0))
+ {
DEBUG_CRITICAL2("Copyright: %s", keyValue);
+ }
else
return STATUS_UNSUCCESSFUL;
vendorID = strlen(keyValue);