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

[<lu...@us...>]

Revision: 245
          http://pyscard.svn.sourceforge.net/pyscard/?rev=245&view=rev
Author:   ludov
Date:     2008-12-16 10:41:18 +0000 (Tue, 16 Dec 2008)

Log Message:
-----------
fail early (with an exception) if a type conversion fails

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

Modified: trunk/pyscard/src/smartcard/scard/PcscTypemaps.i
===================================================================
--- trunk/pyscard/src/smartcard/scard/PcscTypemaps.i	2008-12-16 10:40:29 UTC (rev 244)
+++ trunk/pyscard/src/smartcard/scard/PcscTypemaps.i	2008-12-16 10:41:18 UTC (rev 245)
@@ -48,6 +48,8 @@
 %typemap(in) BYTELIST* INPUT(BYTELIST*)
 {
     $1 =  SCardHelper_PyByteListToBYTELIST( $input );
+    if (NULL == $1)
+        goto fail;
 }
 
 // release bytelist arg
@@ -185,6 +187,8 @@
 %typemap(in) GUIDLIST* INPUT(GUIDLIST*)
 {
     $1 =  SCardHelper_PyGuidListToGUIDLIST( $input );
+    if (NULL == $1)
+        goto fail;
 }
 
 // builds a Python list from a GUID list
@@ -273,6 +277,8 @@
 %typemap(in) READERSTATELIST *prsl(READERSTATELIST*)
 {
     $1 =  SCardHelper_PyReaderStateListToREADERSTATELIST( $input );
+    if (NULL == $1)
+        goto fail;
 }
 
 // builds a Python list from a win32 string list
@@ -303,6 +309,8 @@
 %typemap(in) SCARDCONTEXT hcontext(SCARDCONTEXT)
 {
     $1 =  SCardHelper_PyScardContextToSCARDCONTEXT( $input );
+    if (0 == $1)
+        goto fail;
 }
 
 %typemap(argout) SCARDCONTEXT *OUTPUT
@@ -327,6 +335,8 @@
 %typemap(in) SCARDDWORDARG INPUT(SCARDDWORDARG)
 {
     $1 =  SCardHelper_PySCardDwordArgToSCARDDWORDARG( $input );
+    if (-1 == $1)
+        goto fail;
 }
 
 %typemap(argout) SCARDDWORDARG* OUTPUT
@@ -363,6 +373,8 @@
 %typemap(in) SCARDHANDLE hcard(SCARDHANDLE)
 {
     $1 =  SCardHelper_PyScardHandleToSCARDHANDLE( $input );
+    if (0 == $1)
+        goto fail;
 }
 
 %typemap(argout) SCARDHANDLE* OUTPUT
@@ -454,6 +466,8 @@
 %typemap(in) STRING *INPUT( STRING )
 {
     $1 =  SCardHelper_PyStringToString( $input );
+    if (NULL == $1)
+        goto fail;
 }
 
 // builds a Python string from a STRING
@@ -520,6 +534,8 @@
 %typemap(in) STRINGLIST* INPUT(STRINGLIST*)
 {
     $1 =  SCardHelper_PyStringListToStringList( $input );
+    if (NULL == $1)
+        goto fail;
 }
 
 // builds a Python list from a win32 string list


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