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

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

Revision: 516
          http://pyscard.svn.sourceforge.net/pyscard/?rev=516&view=rev
Author:   ludov
Date:     2010-10-22 12:44:52 +0000 (Fri, 22 Oct 2010)

Log Message:
-----------
Remove support for SCardCancelTransaction(). It is not used on Windows
and removed oin pcsc-lite >= 1.6.5

This function was not exported at the Python interface. So no regression
planned.
This change will just avoid a warning message on the console:
Failed to load symbol for: SCardCancelTransaction, /usr/lib/libpcsclite.so.1: undefined symbol: SCardCancelTransaction!

Modified Paths:
--------------
    trunk/pyscard/src/smartcard/scard/winscarddll.c
    trunk/pyscard/src/smartcard/scard/winscarddll.h

Modified: trunk/pyscard/src/smartcard/scard/winscarddll.c
===================================================================
--- trunk/pyscard/src/smartcard/scard/winscarddll.c	2010-10-10 14:22:30 UTC (rev 515)
+++ trunk/pyscard/src/smartcard/scard/winscarddll.c	2010-10-22 12:44:52 UTC (rev 516)
@@ -463,15 +463,6 @@
 }
 
 static WINSCARDAPI SCARDRETCODE
-WINAPI _defaultSCARDCANCELTRANSACTION(
-    IN      SCARDHANDLE hCard)
-{
-	(void)hCard;
-
-    return SCARD_E_NO_SERVICE;
-}
-
-static WINSCARDAPI SCARDRETCODE
 WINAPI _defaultSCARDCONNECTA(
     IN      SCARDCONTEXT hContext,
     IN      LPCTSTR szReader,
@@ -651,7 +642,6 @@
 
 SCARDBEGINTRANSACTION           mySCardBeginTransaction             = _defaultSCARDBEGINTRANSACTION;
 SCARDCANCEL                     mySCardCancel                       = _defaultSCARDCANCEL;
-SCARDCANCELTRANSACTION          mySCardCancelTransaction            = _defaultSCARDCANCELTRANSACTION;
 SCARDCONNECTA                   mySCardConnectA                     = _defaultSCARDCONNECTA;
 SCARDCONTROL                    mySCardControl                      = _defaultSCARDCONTROL;
 SCARDDISCONNECT                 mySCardDisconnect                   = _defaultSCARDDISCONNECT;
@@ -695,7 +685,6 @@
                 GETPROCADDRESS( SCARDACCESSSTARTEDEVENT         , SCardAccessStartedEvent );
                 GETPROCADDRESS( SCARDBEGINTRANSACTION           , SCardBeginTransaction );
                 GETPROCADDRESS( SCARDCANCEL                     , SCardCancel );
-                GETPROCADDRESS( SCARDCANCELTRANSACTION          , SCardCancelTransaction );
                 GETPROCADDRESS( SCARDCONNECTA                   , SCardConnectA );
                 GETPROCADDRESS( SCARDCONTROL                    , SCardControl );
                 GETPROCADDRESS( SCARDDISCONNECT                 , SCardDisconnect );
@@ -769,7 +758,6 @@
                 lRetCode=SCARD_S_SUCCESS;
                 GETPROCADDRESS( SCARDBEGINTRANSACTION  , SCardBeginTransaction  , SCardBeginTransaction  );
                 GETPROCADDRESS( SCARDCANCEL            , SCardCancel            , SCardCancel );
-                GETPROCADDRESS( SCARDCANCELTRANSACTION , SCardCancelTransaction , SCardCancelTransaction );
                 GETPROCADDRESS( SCARDCONNECTA          , SCardConnectA          , SCardConnect           );
                 GETPROCADDRESS( SCARDDISCONNECT        , SCardDisconnect        , SCardDisconnect        );
                 GETPROCADDRESS( SCARDENDTRANSACTION    , SCardEndTransaction    , SCardEndTransaction    );

Modified: trunk/pyscard/src/smartcard/scard/winscarddll.h
===================================================================
--- trunk/pyscard/src/smartcard/scard/winscarddll.h	2010-10-10 14:22:30 UTC (rev 515)
+++ trunk/pyscard/src/smartcard/scard/winscarddll.h	2010-10-22 12:44:52 UTC (rev 516)
@@ -348,7 +348,6 @@
 
 extern SCARDBEGINTRANSACTION           mySCardBeginTransaction;
 extern SCARDCANCEL                     mySCardCancel;
-extern SCARDCANCELTRANSACTION          mySCardCancelTransaction;
 extern SCARDCONNECTA                   mySCardConnectA;
 extern SCARDCONTROL                    mySCardControl;
 extern SCARDDISCONNECT                 mySCardDisconnect;


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