[Pyscard-devel] SF.net SVN: pyscard: [186] trunk/pyscard/src/smartcard/scard

[<jda...@us...>]

Revision: 186
          http://pyscard.svn.sourceforge.net/pyscard/?rev=186&view=rev
Author:   jdaussel
Date:     2008-01-04 08:26:29 -0800 (Fri, 04 Jan 2008)

Log Message:
-----------
Changed INFINITE value for Mac OS X Tiger to remove random crash with SCardGetStatusChange

Modified Paths:
--------------
    trunk/pyscard/src/smartcard/scard/PcscDefs.i
    trunk/pyscard/src/smartcard/scard/PcscTypemaps.i
    trunk/pyscard/src/smartcard/scard/scard.i

Modified: trunk/pyscard/src/smartcard/scard/PcscDefs.i
===================================================================
--- trunk/pyscard/src/smartcard/scard/PcscDefs.i	2008-01-04 13:17:04 UTC (rev 185)
+++ trunk/pyscard/src/smartcard/scard/PcscDefs.i	2008-01-04 16:26:29 UTC (rev 186)
@@ -322,11 +322,15 @@
 %constant unsigned long SCARD_P_SHUTDOWN = 0x80100018 ;
 
 // Infinite timeout
+// on Mac OS X Tiger, a 0xffffffff infinite time-out causes a random crash upon SCardGetStatusChange return
+#ifdef __TIGER__
+%constant unsigned long INFINITE = 4320000 ;
+#else // !__TIGER__
 %constant unsigned long INFINITE = 0xFFFFFFFF ;
+#endif // __TIGER__
 
 
 
 
 
 
-

Modified: trunk/pyscard/src/smartcard/scard/PcscTypemaps.i
===================================================================
--- trunk/pyscard/src/smartcard/scard/PcscTypemaps.i	2008-01-04 13:17:04 UTC (rev 185)
+++ trunk/pyscard/src/smartcard/scard/PcscTypemaps.i	2008-01-04 16:26:29 UTC (rev 186)
@@ -287,7 +287,7 @@
 
 
 // other names for READERSTATELIST as inpu/output parameter
-%apply READERSTATELIST *BOTH {READERSTATELIST *prsl};
+%apply READERSTATELIST *BOTH {READERSTATELIST* prsl};
 
 
 /*==============================================================================

Modified: trunk/pyscard/src/smartcard/scard/scard.i
===================================================================
--- trunk/pyscard/src/smartcard/scard/scard.i	2008-01-04 13:17:04 UTC (rev 185)
+++ trunk/pyscard/src/smartcard/scard/scard.i	2008-01-04 16:26:29 UTC (rev 186)
@@ -597,8 +597,7 @@
         }
     }
 
-    // internally, we use unsigned long to compare easily scarderr.h values from the debugger
-    // for python, we return a long
+
     return hresult;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.