[Pcsclite-cvs-commit] r4438 - in /trunk/PCSC/src: winscard_clnt.c winscard_msg.h
rousseau at users.alioth.debian.org
rousseau at users.alioth.debian.org
Tue Oct 6 11:58:34 UTC 2009
Author: rousseau
Date: Tue Oct 6 11:58:34 2009
New Revision: 4438
URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4438
Log:
remove typedefs and explicitly use struct for structures
Modified:
trunk/PCSC/src/winscard_clnt.c
trunk/PCSC/src/winscard_msg.h
Modified: trunk/PCSC/src/winscard_clnt.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_clnt.c?rev=4438&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_clnt.c (original)
+++ trunk/PCSC/src/winscard_clnt.c Tue Oct 6 11:58:34 2009
@@ -368,7 +368,7 @@
{
LONG rv;
int i;
- establish_struct scEstablishStruct;
+ struct establish_struct scEstablishStruct;
uint32_t dwClientID = 0;
(void)pvReserved1;
@@ -441,7 +441,7 @@
}
{ /* exchange client/server protocol versions */
- version_struct veStr;
+ struct version_struct veStr;
veStr.major = PROTOCOL_VERSION_MAJOR;
veStr.minor = PROTOCOL_VERSION_MINOR;
@@ -533,7 +533,7 @@
LONG SCardReleaseContext(SCARDCONTEXT hContext)
{
LONG rv;
- release_struct scReleaseStruct;
+ struct release_struct scReleaseStruct;
LONG dwContextIndex;
PROFILE_START
@@ -695,7 +695,7 @@
LPDWORD pdwActiveProtocol)
{
LONG rv;
- connect_struct scConnectStruct;
+ struct connect_struct scConnectStruct;
LONG dwContextIndex;
PROFILE_START
@@ -865,7 +865,7 @@
LPDWORD pdwActiveProtocol)
{
LONG rv;
- reconnect_struct scReconnectStruct;
+ struct reconnect_struct scReconnectStruct;
int i;
DWORD dwContextIndex, dwChannelIndex;
@@ -993,7 +993,7 @@
LONG SCardDisconnect(SCARDHANDLE hCard, DWORD dwDisposition)
{
LONG rv;
- disconnect_struct scDisconnectStruct;
+ struct disconnect_struct scDisconnectStruct;
DWORD dwContextIndex, dwChannelIndex;
PROFILE_START
@@ -1095,7 +1095,7 @@
{
LONG rv;
- begin_struct scBeginStruct;
+ struct begin_struct scBeginStruct;
int i;
DWORD dwContextIndex, dwChannelIndex;
@@ -1230,7 +1230,7 @@
LONG SCardEndTransaction(SCARDHANDLE hCard, DWORD dwDisposition)
{
LONG rv;
- end_struct scEndStruct;
+ struct end_struct scEndStruct;
int randnum, i;
DWORD dwContextIndex, dwChannelIndex;
@@ -1334,7 +1334,7 @@
LONG SCardCancelTransaction(SCARDHANDLE hCard)
{
LONG rv;
- cancel_transaction_struct scCancelStruct;
+ struct cancel_transaction_struct scCancelStruct;
int i;
DWORD dwContextIndex, dwChannelIndex;
@@ -1510,7 +1510,7 @@
DWORD dwReaderLen, dwAtrLen;
LONG rv;
int i;
- status_struct scStatusStruct;
+ struct status_struct scStatusStruct;
DWORD dwContextIndex, dwChannelIndex;
char *r;
char *bufReader = NULL;
Modified: trunk/PCSC/src/winscard_msg.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_msg.h?rev=4438&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_msg.h (original)
+++ trunk/PCSC/src/winscard_msg.h Tue Oct 6 11:58:34 2009
@@ -39,7 +39,6 @@
int32_t minor; /**< IPC minor \ref PROTOCOL_VERSION_MINOR */
uint32_t rv;
};
- typedef struct version_struct version_struct;
/**
* @brief header structure for client/server message data exchange.
@@ -81,7 +80,6 @@
{
uint32_t hContext;
};
- typedef struct client_struct client_struct;
/**
* @brief Information contained in \ref CMD_WAIT_READER_STATE_CHANGE Messages.
@@ -103,7 +101,6 @@
uint32_t hContext;
uint32_t rv;
};
- typedef struct establish_struct establish_struct;
/**
* @brief Information contained in \ref SCARD_RELEASE_CONTEXT Messages.
@@ -115,7 +112,6 @@
uint32_t hContext;
uint32_t rv;
};
- typedef struct release_struct release_struct;
/**
* @brief contained in \ref SCARD_CONNECT Messages.
@@ -132,7 +128,6 @@
uint32_t dwActiveProtocol;
uint32_t rv;
};
- typedef struct connect_struct connect_struct;
/**
* @brief contained in \ref SCARD_RECONNECT Messages.
@@ -148,7 +143,6 @@
uint32_t dwActiveProtocol;
uint32_t rv;
};
- typedef struct reconnect_struct reconnect_struct;
/**
* @brief contained in \ref SCARD_DISCONNECT Messages.
@@ -161,7 +155,6 @@
uint32_t dwDisposition;
uint32_t rv;
};
- typedef struct disconnect_struct disconnect_struct;
/**
* @brief contained in \ref SCARD_BEGIN_TRANSACTION Messages.
@@ -173,7 +166,6 @@
int32_t hCard;
uint32_t rv;
};
- typedef struct begin_struct begin_struct;
/**
* @brief contained in \ref SCARD_END_TRANSACTION Messages.
@@ -186,7 +178,6 @@
uint32_t dwDisposition;
uint32_t rv;
};
- typedef struct end_struct end_struct;
/**
* @brief contained in \ref SCARD_CANCEL Messages.
@@ -198,7 +189,6 @@
int32_t hContext;
uint32_t rv;
};
- typedef struct cancel_struct cancel_struct;
/**
* @brief contained in \ref SCARD_CANCEL_TRANSACTION Messages.
@@ -210,7 +200,6 @@
int32_t hCard;
uint32_t rv;
};
- typedef struct cancel_transaction_struct cancel_transaction_struct;
/**
* @brief contained in \ref SCARD_STATUS Messages.
@@ -228,7 +217,6 @@
uint32_t pcbAtrLen;
uint32_t rv;
};
- typedef struct status_struct status_struct;
/**
* @brief contained in \ref SCARD_TRANSMIT Messages.
@@ -246,7 +234,6 @@
uint32_t pcbRecvLength;
uint32_t rv;
};
- typedef struct transmit_struct transmit_struct;
/**
* @brief contained in \ref SCARD_CONTROL Messages.
@@ -262,7 +249,6 @@
uint32_t dwBytesReturned;
uint32_t rv;
};
- typedef struct control_struct_extended control_struct_extended;
/**
* @brief contained in \ref SCARD_GET_ATTRIB and \c Messages.
@@ -277,7 +263,6 @@
uint32_t cbAttrLen;
uint32_t rv;
};
- typedef struct getset_struct getset_struct;
/*
* Now some function definitions
More information about the Pcsclite-cvs-commit
mailing list