[Pcsclite-cvs-commit] r4321 - in /trunk/PCSC/src: pcsc-wirecheck-gen.c winscard_clnt.c winscard_msg.h winscard_svc.c
rousseau at users.alioth.debian.org
rousseau at users.alioth.debian.org
Fri Jul 17 14:21:51 UTC 2009
Author: rousseau
Date: Fri Jul 17 14:21:50 2009
New Revision: 4321
URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4321
Log:
remove the p in the structure field names pioSendPciProtocol,
pioSendPciLength, pioRecvPciProtocol and pioRecvPciLength since they are
not pointers
Modified:
trunk/PCSC/src/pcsc-wirecheck-gen.c
trunk/PCSC/src/winscard_clnt.c
trunk/PCSC/src/winscard_msg.h
trunk/PCSC/src/winscard_svc.c
Modified: trunk/PCSC/src/pcsc-wirecheck-gen.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/pcsc-wirecheck-gen.c?rev=4321&op=diff
==============================================================================
--- trunk/PCSC/src/pcsc-wirecheck-gen.c (original)
+++ trunk/PCSC/src/pcsc-wirecheck-gen.c Fri Jul 17 14:21:50 2009
@@ -211,12 +211,12 @@
BLANK_LINE ();
CHECK_STRUCT (transmit_struct);
CHECK_MEMBER (transmit_struct, hCard);
- CHECK_MEMBER (transmit_struct, pioSendPciProtocol);
- CHECK_MEMBER (transmit_struct, pioSendPciLength);
+ CHECK_MEMBER (transmit_struct, ioSendPciProtocol);
+ CHECK_MEMBER (transmit_struct, ioSendPciLength);
CHECK_MEMBER (transmit_struct, pbSendBuffer);
CHECK_MEMBER (transmit_struct, cbSendLength);
- CHECK_MEMBER (transmit_struct, pioRecvPciProtocol);
- CHECK_MEMBER (transmit_struct, pioRecvPciLength);
+ CHECK_MEMBER (transmit_struct, ioRecvPciProtocol);
+ CHECK_MEMBER (transmit_struct, ioRecvPciLength);
CHECK_MEMBER (transmit_struct, pbRecvBuffer);
CHECK_MEMBER (transmit_struct, pcbRecvLength);
CHECK_MEMBER (transmit_struct, rv);
Modified: trunk/PCSC/src/winscard_clnt.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_clnt.c?rev=4321&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_clnt.c (original)
+++ trunk/PCSC/src/winscard_clnt.c Fri Jul 17 14:21:50 2009
@@ -2989,20 +2989,20 @@
scTransmitStructExtended->size = sizeof(*scTransmitStructExtended)
- (sizeof(transmit_struct_extended) - offsetof(transmit_struct_extended, data))
+ cbSendLength;
- scTransmitStructExtended->pioSendPciProtocol = pioSendPci->dwProtocol;
- scTransmitStructExtended->pioSendPciLength = pioSendPci->cbPciLength;
+ scTransmitStructExtended->ioSendPciProtocol = pioSendPci->dwProtocol;
+ scTransmitStructExtended->ioSendPciLength = pioSendPci->cbPciLength;
memcpy(scTransmitStructExtended->data, pbSendBuffer, cbSendLength);
scTransmitStructExtended->rv = SCARD_S_SUCCESS;
if (pioRecvPci)
{
- scTransmitStructExtended->pioRecvPciProtocol = pioRecvPci->dwProtocol;
- scTransmitStructExtended->pioRecvPciLength = pioRecvPci->cbPciLength;
+ scTransmitStructExtended->ioRecvPciProtocol = pioRecvPci->dwProtocol;
+ scTransmitStructExtended->ioRecvPciLength = pioRecvPci->cbPciLength;
}
else
{
- scTransmitStructExtended->pioRecvPciProtocol = SCARD_PROTOCOL_ANY;
- scTransmitStructExtended->pioRecvPciLength = sizeof(SCARD_IO_REQUEST);
+ scTransmitStructExtended->ioRecvPciProtocol = SCARD_PROTOCOL_ANY;
+ scTransmitStructExtended->ioRecvPciLength = sizeof(SCARD_IO_REQUEST);
}
rv = WrapSHMWrite(SCARD_TRANSMIT_EXTENDED,
@@ -3056,8 +3056,8 @@
if (pioRecvPci)
{
- pioRecvPci->dwProtocol = scTransmitStructExtended->pioRecvPciProtocol;
- pioRecvPci->cbPciLength = scTransmitStructExtended->pioRecvPciLength;
+ pioRecvPci->dwProtocol = scTransmitStructExtended->ioRecvPciProtocol;
+ pioRecvPci->cbPciLength = scTransmitStructExtended->ioRecvPciLength;
}
}
@@ -3075,8 +3075,8 @@
scTransmitStruct.hCard = hCard;
scTransmitStruct.cbSendLength = cbSendLength;
scTransmitStruct.pcbRecvLength = *pcbRecvLength;
- scTransmitStruct.pioSendPciProtocol = pioSendPci->dwProtocol;
- scTransmitStruct.pioSendPciLength = pioSendPci->cbPciLength;
+ scTransmitStruct.ioSendPciProtocol = pioSendPci->dwProtocol;
+ scTransmitStruct.ioSendPciLength = pioSendPci->cbPciLength;
memcpy(scTransmitStruct.pbSendBuffer, pbSendBuffer, cbSendLength);
memset(scTransmitStruct.pbSendBuffer+cbSendLength, 0, sizeof(scTransmitStruct.pbSendBuffer)-cbSendLength);
memset(scTransmitStruct.pbRecvBuffer, 0, sizeof(scTransmitStruct.pbRecvBuffer));
@@ -3084,13 +3084,13 @@
if (pioRecvPci)
{
- scTransmitStruct.pioRecvPciProtocol = pioRecvPci->dwProtocol;
- scTransmitStruct.pioRecvPciLength = pioRecvPci->cbPciLength;
+ scTransmitStruct.ioRecvPciProtocol = pioRecvPci->dwProtocol;
+ scTransmitStruct.ioRecvPciLength = pioRecvPci->cbPciLength;
}
else
{
- scTransmitStruct.pioRecvPciProtocol = SCARD_PROTOCOL_ANY;
- scTransmitStruct.pioRecvPciLength = sizeof(SCARD_IO_REQUEST);
+ scTransmitStruct.ioRecvPciProtocol = SCARD_PROTOCOL_ANY;
+ scTransmitStruct.ioRecvPciLength = sizeof(SCARD_IO_REQUEST);
}
rv = WrapSHMWrite(SCARD_TRANSMIT,
@@ -3134,8 +3134,8 @@
if (pioRecvPci)
{
- pioRecvPci->dwProtocol = scTransmitStruct.pioRecvPciProtocol;
- pioRecvPci->cbPciLength = scTransmitStruct.pioRecvPciLength;
+ pioRecvPci->dwProtocol = scTransmitStruct.ioRecvPciProtocol;
+ pioRecvPci->cbPciLength = scTransmitStruct.ioRecvPciLength;
}
}
Modified: trunk/PCSC/src/winscard_msg.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_msg.h?rev=4321&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_msg.h (original)
+++ trunk/PCSC/src/winscard_msg.h Fri Jul 17 14:21:50 2009
@@ -248,12 +248,12 @@
struct transmit_struct
{
int32_t hCard;
- uint32_t pioSendPciProtocol;
- uint32_t pioSendPciLength;
+ uint32_t ioSendPciProtocol;
+ uint32_t ioSendPciLength;
uint8_t pbSendBuffer[MAX_BUFFER_SIZE];
uint32_t cbSendLength;
- uint32_t pioRecvPciProtocol;
- uint32_t pioRecvPciLength;
+ uint32_t ioRecvPciProtocol;
+ uint32_t ioRecvPciLength;
uint8_t pbRecvBuffer[MAX_BUFFER_SIZE];
uint32_t pcbRecvLength;
uint32_t rv;
@@ -268,11 +268,11 @@
struct transmit_struct_extended
{
int32_t hCard;
- uint32_t pioSendPciProtocol;
- uint32_t pioSendPciLength;
+ uint32_t ioSendPciProtocol;
+ uint32_t ioSendPciLength;
uint32_t cbSendLength;
- uint32_t pioRecvPciProtocol;
- uint32_t pioRecvPciLength;
+ uint32_t ioRecvPciProtocol;
+ uint32_t ioRecvPciLength;
uint32_t pcbRecvLength;
uint32_t rv;
uint64_t size;
Modified: trunk/PCSC/src/winscard_svc.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_svc.c?rev=4321&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_svc.c (original)
+++ trunk/PCSC/src/winscard_svc.c Fri Jul 17 14:21:50 2009
@@ -418,10 +418,10 @@
break;
}
- ioSendPci.dwProtocol = trStr->pioSendPciProtocol;
- ioSendPci.cbPciLength = trStr->pioSendPciLength;
- ioRecvPci.dwProtocol = trStr->pioRecvPciProtocol;
- ioRecvPci.cbPciLength = trStr->pioRecvPciLength;
+ ioSendPci.dwProtocol = trStr->ioSendPciProtocol;
+ ioSendPci.cbPciLength = trStr->ioSendPciLength;
+ ioRecvPci.dwProtocol = trStr->ioRecvPciProtocol;
+ ioRecvPci.cbPciLength = trStr->ioRecvPciLength;
cbRecvLength = trStr->pcbRecvLength;
trStr->rv = SCardTransmit(trStr->hCard, &ioSendPci,
@@ -429,10 +429,10 @@
&ioRecvPci, trStr->pbRecvBuffer,
&cbRecvLength);
- trStr->pioSendPciProtocol = ioSendPci.dwProtocol;
- trStr->pioSendPciLength = ioSendPci.cbPciLength;
- trStr->pioRecvPciProtocol = ioRecvPci.dwProtocol;
- trStr->pioRecvPciLength = ioRecvPci.cbPciLength;
+ trStr->ioSendPciProtocol = ioSendPci.dwProtocol;
+ trStr->ioSendPciLength = ioSendPci.cbPciLength;
+ trStr->ioRecvPciProtocol = ioRecvPci.dwProtocol;
+ trStr->ioRecvPciLength = ioRecvPci.cbPciLength;
trStr->pcbRecvLength = cbRecvLength;
break;
@@ -536,10 +536,10 @@
else
memcpy(pbSendBuffer, treStr->data, treStr->cbSendLength);
- ioSendPci.dwProtocol = treStr->pioSendPciProtocol;
- ioSendPci.cbPciLength = treStr->pioSendPciLength;
- ioRecvPci.dwProtocol = treStr->pioRecvPciProtocol;
- ioRecvPci.cbPciLength = treStr->pioRecvPciLength;
+ ioSendPci.dwProtocol = treStr->ioSendPciProtocol;
+ ioSendPci.cbPciLength = treStr->ioSendPciLength;
+ ioRecvPci.dwProtocol = treStr->ioRecvPciProtocol;
+ ioRecvPci.cbPciLength = treStr->ioRecvPciLength;
cbRecvLength = treStr->pcbRecvLength;
treStr->rv = SCardTransmit(treStr->hCard, &ioSendPci,
@@ -547,10 +547,10 @@
&ioRecvPci, pbRecvBuffer,
&cbRecvLength);
- treStr->pioSendPciProtocol = ioSendPci.dwProtocol;
- treStr->pioSendPciLength = ioSendPci.cbPciLength;
- treStr->pioRecvPciProtocol = ioRecvPci.dwProtocol;
- treStr->pioRecvPciLength = ioRecvPci.cbPciLength;
+ treStr->ioSendPciProtocol = ioSendPci.dwProtocol;
+ treStr->ioSendPciLength = ioSendPci.cbPciLength;
+ treStr->ioRecvPciProtocol = ioRecvPci.dwProtocol;
+ treStr->ioRecvPciLength = ioRecvPci.cbPciLength;
treStr->pcbRecvLength = cbRecvLength;
treStr->size = offsetof(transmit_struct_extended, data) + treStr->pcbRecvLength;
More information about the Pcsclite-cvs-commit
mailing list