[Pcsclite-cvs-commit] PCSC/src ifdwrapper.c,1.10,1.11

[sauveron-guest@quantz.debian.org]

Update of /cvsroot/pcsclite/PCSC/src
In directory quantz:/tmp/cvs-serv18956/src

Modified Files:
	ifdwrapper.c 
Log Message:
Use the device name to create channel only if defined.

Index: ifdwrapper.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/ifdwrapper.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ifdwrapper.c	16 Jan 2004 11:28:51 -0000	1.10
+++ ifdwrapper.c	19 Jan 2004 10:28:40 -0000	1.11
@@ -181,7 +181,11 @@
 		rv = (*IFDH_create_channel) (rContext->dwSlot, rContext->dwPort);
 	} else
 	{
-		rv = (*IFDH_create_channel_by_name) (rContext->dwSlot, rContext->lpcDevice);
+		/* use device name only if defined */
+		if (rContext->lpcDevice[0] != '\0')
+			rv = (*IFDH_create_channel_by_name) (rContext->dwSlot, rContext->lpcDevice);
+		else
+			rv = (*IFDH_create_channel) (rContext->dwSlot, rContext->dwPort);
 	}
 #else
 	if (rContext->dwVersion == IFD_HVERSION_1_0)
@@ -192,7 +196,11 @@
 		rv = IFDHCreateChannel(rContext->dwSlot, rContext->dwPort);
 	} else
 	{
-		rv = IFDHCreateChannelByName(rContext->dwSlot, rContext->lpcDevice);
+		/* Use device name only if defined */
+		if (rContext->lpcDevice[0] != '\0')
+			rv = IFDHCreateChannelByName(rContext->dwSlot, rContext->lpcDevice);
+		else
+			rv = IFDHCreateChannel(rContext->dwSlot, rContext->dwPort);
 	}
 #endif
 	SYS_MutexUnLock(rContext->mMutex);