[Pcsclite-cvs-commit] r4320 - 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:15:21 UTC 2009
Author: rousseau
Date: Fri Jul 17 14:15:20 2009
New Revision: 4320
URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4320
Log:
remove the p in the structure field names pdwActiveProtocol, pdwState,
pdwProtocol, pdwBytesReturned 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=4320&op=diff
==============================================================================
--- trunk/PCSC/src/pcsc-wirecheck-gen.c (original)
+++ trunk/PCSC/src/pcsc-wirecheck-gen.c Fri Jul 17 14:15:20 2009
@@ -163,7 +163,7 @@
CHECK_MEMBER (connect_struct, dwShareMode);
CHECK_MEMBER (connect_struct, dwPreferredProtocols);
CHECK_MEMBER (connect_struct, hCard);
- CHECK_MEMBER (connect_struct, pdwActiveProtocol);
+ CHECK_MEMBER (connect_struct, dwActiveProtocol);
CHECK_MEMBER (connect_struct, rv);
BLANK_LINE ();
@@ -172,7 +172,7 @@
CHECK_MEMBER (reconnect_struct, dwShareMode);
CHECK_MEMBER (reconnect_struct, dwPreferredProtocols);
CHECK_MEMBER (reconnect_struct, dwInitialization);
- CHECK_MEMBER (reconnect_struct, pdwActiveProtocol);
+ CHECK_MEMBER (reconnect_struct, dwActiveProtocol);
CHECK_MEMBER (reconnect_struct, rv);
BLANK_LINE ();
@@ -202,8 +202,8 @@
CHECK_MEMBER (status_struct, hCard);
CHECK_MEMBER (status_struct, mszReaderNames);
CHECK_MEMBER (status_struct, pcchReaderLen);
- CHECK_MEMBER (status_struct, pdwState);
- CHECK_MEMBER (status_struct, pdwProtocol);
+ CHECK_MEMBER (status_struct, dwState);
+ CHECK_MEMBER (status_struct, dwProtocol);
CHECK_MEMBER (status_struct, pbAtr);
CHECK_MEMBER (status_struct, pcbAtrLen);
CHECK_MEMBER (status_struct, rv);
Modified: trunk/PCSC/src/winscard_clnt.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_clnt.c?rev=4320&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_clnt.c (original)
+++ trunk/PCSC/src/winscard_clnt.c Fri Jul 17 14:15:20 2009
@@ -785,7 +785,7 @@
scConnectStruct.dwShareMode = dwShareMode;
scConnectStruct.dwPreferredProtocols = dwPreferredProtocols;
scConnectStruct.hCard = 0;
- scConnectStruct.pdwActiveProtocol = 0;
+ scConnectStruct.dwActiveProtocol = 0;
scConnectStruct.rv = SCARD_S_SUCCESS;
rv = WrapSHMWrite(SCARD_CONNECT, psContextMap[dwContextIndex].dwClientID,
@@ -813,7 +813,7 @@
}
*phCard = scConnectStruct.hCard;
- *pdwActiveProtocol = scConnectStruct.pdwActiveProtocol;
+ *pdwActiveProtocol = scConnectStruct.dwActiveProtocol;
if (scConnectStruct.rv == SCARD_S_SUCCESS)
{
@@ -959,7 +959,7 @@
scReconnectStruct.dwShareMode = dwShareMode;
scReconnectStruct.dwPreferredProtocols = dwPreferredProtocols;
scReconnectStruct.dwInitialization = dwInitialization;
- scReconnectStruct.pdwActiveProtocol = *pdwActiveProtocol;
+ scReconnectStruct.dwActiveProtocol = *pdwActiveProtocol;
scReconnectStruct.rv = SCARD_S_SUCCESS;
rv = WrapSHMWrite(SCARD_RECONNECT, psContextMap[dwContextIndex].dwClientID,
@@ -987,7 +987,7 @@
}
} while (SCARD_E_SHARING_VIOLATION == scReconnectStruct.rv);
- *pdwActiveProtocol = scReconnectStruct.pdwActiveProtocol;
+ *pdwActiveProtocol = scReconnectStruct.dwActiveProtocol;
(void)SYS_MutexUnLock(psContextMap[dwContextIndex].mMutex);
@@ -2431,7 +2431,7 @@
scControlStructExtended->dwControlCode = dwControlCode;
scControlStructExtended->cbSendLength = cbSendLength;
scControlStructExtended->cbRecvLength = cbRecvLength;
- scControlStructExtended->pdwBytesReturned = 0;
+ scControlStructExtended->dwBytesReturned = 0;
scControlStructExtended->rv = SCARD_S_SUCCESS;
/* The size of data to send is the size of
* struct control_struct_extended WITHOUT the data[] field
@@ -2488,13 +2488,13 @@
* Copy and zero it so any secret information is not leaked
*/
memcpy(pbRecvBuffer, scControlStructExtended -> data,
- scControlStructExtended -> pdwBytesReturned);
+ scControlStructExtended -> dwBytesReturned);
memset(scControlStructExtended -> data, 0x00,
- scControlStructExtended -> pdwBytesReturned);
+ scControlStructExtended -> dwBytesReturned);
}
if (NULL != lpBytesReturned)
- *lpBytesReturned = scControlStructExtended -> pdwBytesReturned;
+ *lpBytesReturned = scControlStructExtended -> dwBytesReturned;
rv = scControlStructExtended -> rv;
}
Modified: trunk/PCSC/src/winscard_msg.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_msg.h?rev=4320&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_msg.h (original)
+++ trunk/PCSC/src/winscard_msg.h Fri Jul 17 14:15:20 2009
@@ -151,7 +151,7 @@
uint32_t dwShareMode;
uint32_t dwPreferredProtocols;
int32_t hCard;
- uint32_t pdwActiveProtocol;
+ uint32_t dwActiveProtocol;
uint32_t rv;
};
typedef struct connect_struct connect_struct;
@@ -167,7 +167,7 @@
uint32_t dwShareMode;
uint32_t dwPreferredProtocols;
uint32_t dwInitialization;
- uint32_t pdwActiveProtocol;
+ uint32_t dwActiveProtocol;
uint32_t rv;
};
typedef struct reconnect_struct reconnect_struct;
@@ -232,8 +232,8 @@
int32_t hCard;
char mszReaderNames[MAX_READERNAME];
uint32_t pcchReaderLen;
- uint32_t pdwState;
- uint32_t pdwProtocol;
+ uint32_t dwState;
+ uint32_t dwProtocol;
uint8_t pbAtr[MAX_ATR_SIZE];
uint32_t pcbAtrLen;
uint32_t rv;
@@ -309,7 +309,7 @@
uint32_t dwControlCode;
uint32_t cbSendLength;
uint32_t cbRecvLength;
- uint32_t pdwBytesReturned;
+ uint32_t dwBytesReturned;
uint32_t rv;
uint64_t size;
uint8_t data[1];
Modified: trunk/PCSC/src/winscard_svc.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_svc.c?rev=4320&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_svc.c (original)
+++ trunk/PCSC/src/winscard_svc.c Fri Jul 17 14:15:20 2009
@@ -318,14 +318,14 @@
coStr = ((connect_struct *) msgStruct->data);
hCard = coStr->hCard;
- dwActiveProtocol = coStr->pdwActiveProtocol;
+ dwActiveProtocol = coStr->dwActiveProtocol;
coStr->rv = SCardConnect(coStr->hContext, coStr->szReader,
coStr->dwShareMode, coStr->dwPreferredProtocols,
&hCard, &dwActiveProtocol);
coStr->hCard = hCard;
- coStr->pdwActiveProtocol = dwActiveProtocol;
+ coStr->dwActiveProtocol = dwActiveProtocol;
if (coStr->rv == SCARD_S_SUCCESS)
coStr->rv =
@@ -341,7 +341,7 @@
rcStr->rv = SCardReconnect(rcStr->hCard, rcStr->dwShareMode,
rcStr->dwPreferredProtocols,
rcStr->dwInitialization, &dwActiveProtocol);
- rcStr->pdwActiveProtocol = dwActiveProtocol;
+ rcStr->dwActiveProtocol = dwActiveProtocol;
break;
case SCARD_DISCONNECT:
@@ -383,8 +383,8 @@
if (rv != 0) return rv;
cchReaderLen = stStr->pcchReaderLen;
- dwState = stStr->pdwState;
- dwProtocol = stStr->pdwProtocol;
+ dwState = stStr->dwState;
+ dwProtocol = stStr->dwProtocol;
cbAtrLen = stStr->pcbAtrLen;
/* avoids buffer overflow */
@@ -400,8 +400,8 @@
&dwProtocol, stStr->pbAtr, &cbAtrLen);
stStr->pcchReaderLen = cchReaderLen;
- stStr->pdwState = dwState;
- stStr->pdwProtocol = dwProtocol;
+ stStr->dwState = dwState;
+ stStr->dwProtocol = dwProtocol;
stStr->pcbAtrLen = cbAtrLen;
break;
@@ -626,16 +626,16 @@
else
memcpy(pbSendBuffer, cteStr->data, cteStr->cbSendLength);
- dwBytesReturned = cteStr->pdwBytesReturned;
+ dwBytesReturned = cteStr->dwBytesReturned;
cteStr->rv = SCardControl(cteStr->hCard, cteStr->dwControlCode,
pbSendBuffer, cteStr->cbSendLength,
pbRecvBuffer, cteStr->cbRecvLength,
&dwBytesReturned);
- cteStr->pdwBytesReturned = dwBytesReturned;
-
- cteStr->size = sizeof(*cteStr) + cteStr->pdwBytesReturned;
+ cteStr->dwBytesReturned = dwBytesReturned;
+
+ cteStr->size = sizeof(*cteStr) + cteStr->dwBytesReturned;
if (cteStr->size > PCSCLITE_MAX_MESSAGE_SIZE)
{
/* two blocks */
@@ -659,7 +659,7 @@
else
{
/* one block only */
- memcpy(cteStr->data, pbRecvBuffer, cteStr->pdwBytesReturned);
+ memcpy(cteStr->data, pbRecvBuffer, cteStr->dwBytesReturned);
rv = SHMMessageSend(msgStruct, sizeof(*msgStruct),
psContext[dwContextIndex].dwClientID,
More information about the Pcsclite-cvs-commit
mailing list