remove a bit code duplication
git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@1315 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
parent
91d106dd41
commit
58280c0b72
7
scard.c
7
scard.c
@ -2158,20 +2158,17 @@ TS_SCardControl(STREAM in, STREAM out)
|
|||||||
printf("---> Calling SCardControl\n");
|
printf("---> Calling SCardControl\n");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef WITH_PCSC120
|
|
||||||
sc_nBytesReturned = nBytesReturned;
|
sc_nBytesReturned = nBytesReturned;
|
||||||
myHCard = scHandleToMyPCSC(hCard);
|
myHCard = scHandleToMyPCSC(hCard);
|
||||||
|
#ifdef WITH_PCSC120
|
||||||
rv = SCardControl(myHCard, pInBuffer, (MYPCSC_DWORD) nInBufferSize, pOutBuffer,
|
rv = SCardControl(myHCard, pInBuffer, (MYPCSC_DWORD) nInBufferSize, pOutBuffer,
|
||||||
&sc_nBytesReturned);
|
&sc_nBytesReturned);
|
||||||
nBytesReturned = sc_nBytesReturned;
|
|
||||||
#else
|
#else
|
||||||
sc_nBytesReturned = nBytesReturned;
|
|
||||||
myHCard = scHandleToMyPCSC(hCard);
|
|
||||||
rv = SCardControl(myHCard, (MYPCSC_DWORD) dwControlCode, pInBuffer,
|
rv = SCardControl(myHCard, (MYPCSC_DWORD) dwControlCode, pInBuffer,
|
||||||
(MYPCSC_DWORD) nInBufferSize, pOutBuffer,
|
(MYPCSC_DWORD) nInBufferSize, pOutBuffer,
|
||||||
(MYPCSC_DWORD) nOutBufferRealSize, &sc_nBytesReturned);
|
(MYPCSC_DWORD) nOutBufferRealSize, &sc_nBytesReturned);
|
||||||
nBytesReturned = sc_nBytesReturned;
|
|
||||||
#endif
|
#endif
|
||||||
|
nBytesReturned = sc_nBytesReturned;
|
||||||
|
|
||||||
#ifdef WITH_SCARD_DEBUG
|
#ifdef WITH_SCARD_DEBUG
|
||||||
if (rv != SCARD_S_SUCCESS)
|
if (rv != SCARD_S_SUCCESS)
|
||||||
|
Loading…
Reference in New Issue
Block a user