[Pcsclite-cvs-commit] CVS MCardPlugin/src

[CVS User rousseau]

Update of /cvsroot/muscleplugins/MCardPlugin/src
In directory haydn:/tmp/cvs-serv23919

Modified Files:
	musclecardApplet.c 
Log Message:
getUShort16(): use + instead of || (logical OR) to concatenate the two
bytes

Thanks to Karsten Ohme for the patch


--- /cvsroot/muscleplugins/MCardPlugin/src/musclecardApplet.c	2004/09/17 17:43:32	1.43
+++ /cvsroot/muscleplugins/MCardPlugin/src/musclecardApplet.c	2005/04/07 06:29:27	1.44
@@ -11,7 +11,7 @@
             Purpose: This abstracts the Card Edge Interface APDU's
 	             into client side function calls.
  
-$Id: musclecardApplet.c,v 1.43 2004/09/17 17:43:32 corcoran-guest Exp $
+$Id: musclecardApplet.c,v 1.44 2005/04/07 06:29:27 rousseau Exp $
 ********************************************************************/
 #ifdef WIN32
 #include "../win32/MCardPlugin.h"
@@ -1968,7 +1968,7 @@
 }
 
 MSCUShort16 getUShort16(MSCPUChar8 srcValue) {
-  return ( (((MSCUShort16)srcValue[0]) << 8) || srcValue[1] );
+  return ( (((MSCUShort16)srcValue[0]) << 8) + srcValue[1] );
 }
 
 void setUShort16(MSCPUChar8 dstValue, MSCUShort16 srcValue) {