[Pcsclite-cvs-commit] r3260 - in /trunk/PCSC/src: PCSC/winscard.h atrhandler.h configfile.h dyn_generic.h ifdwrapper.c ifdwrapper.h parser.h readerfactory.h sys_generic.h winscard_clnt.c winscard_msg.h winscard_msg_srv.c
rousseau at users.alioth.debian.org
rousseau at users.alioth.debian.org
Fri Jan 2 15:19:59 UTC 2009
Author: rousseau
Date: Fri Jan 2 15:19:59 2009
New Revision: 3260
URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=3260
Log:
tag output parameters with /*@out@*/
Modified:
trunk/PCSC/src/PCSC/winscard.h
trunk/PCSC/src/atrhandler.h
trunk/PCSC/src/configfile.h
trunk/PCSC/src/dyn_generic.h
trunk/PCSC/src/ifdwrapper.c
trunk/PCSC/src/ifdwrapper.h
trunk/PCSC/src/parser.h
trunk/PCSC/src/readerfactory.h
trunk/PCSC/src/sys_generic.h
trunk/PCSC/src/winscard_clnt.c
trunk/PCSC/src/winscard_msg.h
trunk/PCSC/src/winscard_msg_srv.c
Modified: trunk/PCSC/src/PCSC/winscard.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/PCSC/winscard.h?rev=3260&op=diff
==============================================================================
--- trunk/PCSC/src/PCSC/winscard.h (original)
+++ trunk/PCSC/src/PCSC/winscard.h Fri Jan 2 15:19:59 2009
@@ -29,7 +29,7 @@
PCSC_API LONG SCardEstablishContext(DWORD dwScope,
/*@null@*/ LPCVOID pvReserved1, /*@null@*/ LPCVOID pvReserved2,
- LPSCARDCONTEXT phContext);
+ /*@out@*/ LPSCARDCONTEXT phContext);
PCSC_API LONG SCardReleaseContext(SCARDCONTEXT hContext);
@@ -41,12 +41,12 @@
LPCSTR szReader,
DWORD dwShareMode,
DWORD dwPreferredProtocols,
- LPSCARDHANDLE phCard, LPDWORD pdwActiveProtocol);
+ /*@out@*/ LPSCARDHANDLE phCard, /*@out@*/ LPDWORD pdwActiveProtocol);
PCSC_API LONG SCardReconnect(SCARDHANDLE hCard,
DWORD dwShareMode,
DWORD dwPreferredProtocols,
- DWORD dwInitialization, LPDWORD pdwActiveProtocol);
+ DWORD dwInitialization, /*@out@*/ LPDWORD pdwActiveProtocol);
PCSC_API LONG SCardDisconnect(SCARDHANDLE hCard, DWORD dwDisposition);
@@ -57,10 +57,12 @@
PCSC_API LONG SCardCancelTransaction(SCARDHANDLE hCard);
PCSC_API LONG SCardStatus(SCARDHANDLE hCard,
- /*@null@*/ LPSTR mszReaderName, /*@null@*/ LPDWORD pcchReaderLen,
- /*@null@*/ LPDWORD pdwState,
- /*@null@*/ LPDWORD pdwProtocol,
- /*@null@*/ LPBYTE pbAtr, /*@null@*/ LPDWORD pcbAtrLen);
+ /*@null@*/ /*@out@*/ LPSTR mszReaderName,
+ /*@null@*/ /*@out@*/ LPDWORD pcchReaderLen,
+ /*@null@*/ /*@out@*/ LPDWORD pdwState,
+ /*@null@*/ /*@out@*/ LPDWORD pdwProtocol,
+ /*@null@*/ /*@out@*/ LPBYTE pbAtr,
+ /*@null@*/ /*@out@*/ LPDWORD pcbAtrLen);
PCSC_API LONG SCardGetStatusChange(SCARDCONTEXT hContext,
DWORD dwTimeout,
@@ -68,27 +70,29 @@
PCSC_API LONG SCardControl(SCARDHANDLE hCard, DWORD dwControlCode,
LPCVOID pbSendBuffer, DWORD cbSendLength,
- LPVOID pbRecvBuffer, DWORD cbRecvLength, LPDWORD lpBytesReturned);
+ /*@out@*/ LPVOID pbRecvBuffer, DWORD cbRecvLength,
+ LPDWORD lpBytesReturned);
PCSC_API LONG SCardTransmit(SCARDHANDLE hCard,
LPCSCARD_IO_REQUEST pioSendPci,
LPCBYTE pbSendBuffer, DWORD cbSendLength,
- LPSCARD_IO_REQUEST pioRecvPci,
- LPBYTE pbRecvBuffer, LPDWORD pcbRecvLength);
+ /*@out@*/ LPSCARD_IO_REQUEST pioRecvPci,
+ /*@out@*/ LPBYTE pbRecvBuffer, LPDWORD pcbRecvLength);
PCSC_API LONG SCardListReaderGroups(SCARDCONTEXT hContext,
- LPSTR mszGroups, LPDWORD pcchGroups);
+ /*@out@*/ LPSTR mszGroups, LPDWORD pcchGroups);
PCSC_API LONG SCardListReaders(SCARDCONTEXT hContext,
- /*@null@*/ LPCSTR mszGroups,
- /*@null@*/ LPSTR mszReaders, LPDWORD pcchReaders);
+ /*@null@*/ /*@out@*/ LPCSTR mszGroups,
+ /*@null@*/ /*@out@*/ LPSTR mszReaders,
+ /*@out@*/ LPDWORD pcchReaders);
PCSC_API LONG SCardFreeMemory(SCARDCONTEXT hContext, LPCVOID pvMem);
PCSC_API LONG SCardCancel(SCARDCONTEXT hContext);
PCSC_API LONG SCardGetAttrib(SCARDHANDLE hCard, DWORD dwAttrId,
- LPBYTE pbAttr, LPDWORD pcbAttrLen);
+ /*@out@*/ LPBYTE pbAttr, LPDWORD pcbAttrLen);
PCSC_API LONG SCardSetAttrib(SCARDHANDLE hCard, DWORD dwAttrId,
LPCBYTE pbAttr, DWORD cbAttrLen);
Modified: trunk/PCSC/src/atrhandler.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/atrhandler.h?rev=3260&op=diff
==============================================================================
--- trunk/PCSC/src/atrhandler.h (original)
+++ trunk/PCSC/src/atrhandler.h Fri Jan 2 15:19:59 2009
@@ -50,7 +50,7 @@
* Decodes the ATR and fills the structure
*/
- short ATRDecodeAtr(PSMARTCARD_EXTENSION psExtension,
+ short ATRDecodeAtr(/*@out@*/ PSMARTCARD_EXTENSION psExtension,
PUCHAR pucAtr, DWORD dwLength);
#ifdef __cplusplus
Modified: trunk/PCSC/src/configfile.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/configfile.h?rev=3260&op=diff
==============================================================================
--- trunk/PCSC/src/configfile.h (original)
+++ trunk/PCSC/src/configfile.h Fri Jan 2 15:19:59 2009
@@ -17,7 +17,8 @@
{
#endif
- int DBGetReaderList(const char *readerconf, SerialReader **caller_reader_list);
+ int DBGetReaderList(const char *readerconf,
+ /*@out@*/ SerialReader **caller_reader_list);
#ifdef __cplusplus
}
Modified: trunk/PCSC/src/dyn_generic.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/dyn_generic.h?rev=3260&op=diff
==============================================================================
--- trunk/PCSC/src/dyn_generic.h (original)
+++ trunk/PCSC/src/dyn_generic.h Fri Jan 2 15:19:59 2009
@@ -22,7 +22,7 @@
int DYN_LoadLibrary(void **, char *);
int DYN_CloseLibrary(void **);
- int DYN_GetAddress(void *, void **, const char *);
+ int DYN_GetAddress(void *, /*@out@*/ void **, const char *);
#ifdef __cplusplus
}
Modified: trunk/PCSC/src/ifdwrapper.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/ifdwrapper.c?rev=3260&op=diff
==============================================================================
--- trunk/PCSC/src/ifdwrapper.c (original)
+++ trunk/PCSC/src/ifdwrapper.c Fri Jan 2 15:19:59 2009
@@ -278,8 +278,8 @@
RESPONSECODE rv = IFD_SUCCESS;
#ifndef PCSCLITE_STATIC_DRIVER
- RESPONSECODE(*IFD_get_capabilities) (DWORD, PUCHAR) = NULL;
- RESPONSECODE(*IFDH_get_capabilities) (DWORD, DWORD, PDWORD, PUCHAR) = NULL;
+ RESPONSECODE(*IFD_get_capabilities) (DWORD, /*@out@*/ PUCHAR) = NULL;
+ RESPONSECODE(*IFDH_get_capabilities) (DWORD, DWORD, PDWORD, /*@out@*/ PUCHAR) = NULL;
if (rContext->dwVersion == IFD_HVERSION_1_0)
IFD_get_capabilities =
@@ -420,7 +420,7 @@
#ifndef PCSCLITE_STATIC_DRIVER
RESPONSECODE(*IFD_is_icc_present) (void) = NULL;
RESPONSECODE(*IFDH_icc_presence) (DWORD) = NULL;
- RESPONSECODE(*IFD_get_capabilities) (DWORD, PUCHAR) = NULL;
+ RESPONSECODE(*IFD_get_capabilities) (DWORD, /*@out@*/ PUCHAR) = NULL;
if (rContext->dwVersion == IFD_HVERSION_1_0)
{
@@ -555,7 +555,8 @@
RESPONSECODE rv = IFD_SUCCESS;
#ifndef PCSCLITE_STATIC_DRIVER
- RESPONSECODE(*IFDH_control_v2) (DWORD, PUCHAR, DWORD, PUCHAR, PDWORD);
+ RESPONSECODE(*IFDH_control_v2) (DWORD, PUCHAR, DWORD, /*@out@*/ PUCHAR,
+ PDWORD);
#endif
if (rContext->dwVersion != IFD_HVERSION_2_0)
@@ -656,9 +657,9 @@
#ifndef PCSCLITE_STATIC_DRIVER
RESPONSECODE(*IFD_transmit_to_icc) (SCARD_IO_HEADER, PUCHAR, DWORD,
- PUCHAR, PDWORD, PSCARD_IO_HEADER) = NULL;
+ /*@out@*/ PUCHAR, PDWORD, PSCARD_IO_HEADER) = NULL;
RESPONSECODE(*IFDH_transmit_to_icc) (DWORD, SCARD_IO_HEADER, PUCHAR,
- DWORD, PUCHAR, PDWORD, PSCARD_IO_HEADER) = NULL;
+ DWORD, /*@out@*/ PUCHAR, PDWORD, PSCARD_IO_HEADER) = NULL;
#endif
/* log the APDU */
Modified: trunk/PCSC/src/ifdwrapper.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/ifdwrapper.h?rev=3260&op=diff
==============================================================================
--- trunk/PCSC/src/ifdwrapper.h (original)
+++ trunk/PCSC/src/ifdwrapper.h Fri Jan 2 15:19:59 2009
@@ -24,16 +24,18 @@
LONG IFDOpenIFD(PREADER_CONTEXT);
LONG IFDCloseIFD(PREADER_CONTEXT);
- LONG IFDPowerICC(PREADER_CONTEXT, DWORD, PUCHAR, PDWORD);
- LONG IFDStatusICC(PREADER_CONTEXT, PDWORD, PUCHAR, PDWORD);
- LONG IFDControl_v2(PREADER_CONTEXT, PUCHAR, DWORD, PUCHAR, PDWORD);
+ LONG IFDPowerICC(PREADER_CONTEXT, DWORD, PUCHAR, /*@out@*/ PDWORD);
+ LONG IFDStatusICC(PREADER_CONTEXT, /*@out@*/ PDWORD, /*@out@*/ PUCHAR,
+ /*@out@*/ PDWORD);
+ LONG IFDControl_v2(PREADER_CONTEXT, PUCHAR, DWORD, /*@out@*/ PUCHAR,
+ PDWORD);
LONG IFDControl(PREADER_CONTEXT, DWORD, LPCVOID, DWORD, LPVOID,
DWORD, LPDWORD);
LONG IFDTransmit(PREADER_CONTEXT, SCARD_IO_HEADER,
- PUCHAR, DWORD, PUCHAR, PDWORD, PSCARD_IO_HEADER);
+ PUCHAR, DWORD, /*@out@*/ PUCHAR, PDWORD, PSCARD_IO_HEADER);
LONG IFDSetPTS(PREADER_CONTEXT, DWORD, UCHAR, UCHAR, UCHAR, UCHAR);
LONG IFDSetCapabilities(PREADER_CONTEXT, DWORD, DWORD, PUCHAR);
- LONG IFDGetCapabilities(PREADER_CONTEXT, DWORD, PDWORD, PUCHAR);
+ LONG IFDGetCapabilities(PREADER_CONTEXT, DWORD, PDWORD, /*@out@*/ PUCHAR);
#ifdef __cplusplus
}
Modified: trunk/PCSC/src/parser.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/parser.h?rev=3260&op=diff
==============================================================================
--- trunk/PCSC/src/parser.h (original)
+++ trunk/PCSC/src/parser.h Fri Jan 2 15:19:59 2009
@@ -28,7 +28,7 @@
#define TOKEN_TYPE_STRING 2
int LTPBundleFindValueWithKey(const char *fileName, const char *tokenKey,
- char *tokenValue, int tokenIndice);
+ /*@out@*/ char *tokenValue, int tokenIndice);
#ifdef __cplusplus
}
Modified: trunk/PCSC/src/readerfactory.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/readerfactory.h?rev=3260&op=diff
==============================================================================
--- trunk/PCSC/src/readerfactory.h (original)
+++ trunk/PCSC/src/readerfactory.h Fri Jan 2 15:19:59 2009
@@ -143,9 +143,9 @@
LONG RFRemoveReader(LPSTR, DWORD);
LONG RFSetReaderName(PREADER_CONTEXT, LPSTR, LPSTR, DWORD, DWORD);
LONG RFListReaders(LPSTR, LPDWORD);
- LONG RFReaderInfo(LPSTR, struct ReaderContext **);
- LONG RFReaderInfoNamePort(DWORD, LPSTR, struct ReaderContext **);
- LONG RFReaderInfoById(DWORD, struct ReaderContext **);
+ LONG RFReaderInfo(LPSTR, /*@out@*/ struct ReaderContext **);
+ LONG RFReaderInfoNamePort(DWORD, LPSTR, /*@out@*/ struct ReaderContext **);
+ LONG RFReaderInfoById(DWORD, /*@out@*/ struct ReaderContext **);
LONG RFCheckSharing(DWORD);
LONG RFLockSharing(DWORD);
LONG RFUnlockSharing(DWORD);
Modified: trunk/PCSC/src/sys_generic.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/sys_generic.h?rev=3260&op=diff
==============================================================================
--- trunk/PCSC/src/sys_generic.h (original)
+++ trunk/PCSC/src/sys_generic.h Fri Jan 2 15:19:59 2009
@@ -51,7 +51,7 @@
int SYS_SeekFile(int, int);
- int SYS_ReadFile(int, char *, int);
+ int SYS_ReadFile(int, /*@out@*/ char *, int);
int SYS_WriteFile(int, const char *, int);
@@ -69,7 +69,7 @@
int SYS_Daemon(int, int);
- int SYS_Stat(const char *pcFile, struct stat *psStatus);
+ int SYS_Stat(const char *pcFile, /*@out@*/ struct stat *psStatus);
int SYS_RandomInt(int, int);
Modified: trunk/PCSC/src/winscard_clnt.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_clnt.c?rev=3260&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_clnt.c (original)
+++ trunk/PCSC/src/winscard_clnt.c Fri Jan 2 15:19:59 2009
@@ -231,8 +231,10 @@
static LONG SCardCleanContext(LONG indice);
static LONG SCardAddHandle(SCARDHANDLE, DWORD, LPCSTR);
-static LONG SCardGetIndicesFromHandle(SCARDHANDLE, PDWORD, PDWORD);
-static LONG SCardGetIndicesFromHandleTH(SCARDHANDLE, PDWORD, PDWORD);
+static LONG SCardGetIndicesFromHandle(SCARDHANDLE, /*@out@*/ PDWORD,
+ /*@out@*/ PDWORD);
+static LONG SCardGetIndicesFromHandleTH(SCARDHANDLE, /*@out@*/ PDWORD,
+ /*@out@*/ PDWORD);
static LONG SCardRemoveHandle(SCARDHANDLE);
static LONG SCardGetSetAttrib(SCARDHANDLE hCard, int command, DWORD dwAttrId,
@@ -264,7 +266,8 @@
return SYS_MutexUnLock(&clientMutex);
}
-static LONG SCardEstablishContextTH(DWORD, LPCVOID, LPCVOID, LPSCARDCONTEXT);
+static LONG SCardEstablishContextTH(DWORD, LPCVOID, LPCVOID,
+ /*@out@*/ LPSCARDCONTEXT);
/**
* @brief Creates an Application Context to the PC/SC Resource Manager.
Modified: trunk/PCSC/src/winscard_msg.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_msg.h?rev=3260&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_msg.h (original)
+++ trunk/PCSC/src/winscard_msg.h Fri Jan 2 15:19:59 2009
@@ -335,11 +335,11 @@
int32_t SHMClientSetupSession(uint32_t *);
int32_t SHMClientCloseSession(uint32_t);
int32_t SHMInitializeCommonSegment(void);
- int32_t SHMProcessEventsContext(uint32_t, psharedSegmentMsg);
- int32_t SHMProcessEventsServer(uint32_t *);
+ int32_t SHMProcessEventsContext(uint32_t, /*@out@*/ psharedSegmentMsg);
+ int32_t SHMProcessEventsServer(/*@out@*/ uint32_t *);
int32_t SHMMessageSend(void *buffer, uint64_t buffer_size, int32_t filedes,
int32_t blockAmount);
- int32_t SHMMessageReceive(void *buffer, uint64_t buffer_size,
+ int32_t SHMMessageReceive(/*@out@*/ void *buffer, uint64_t buffer_size,
int32_t filedes, int32_t blockAmount);
int32_t WrapSHMWrite(uint32_t command, uint32_t dwClientID, uint64_t size,
uint32_t blockAmount, void *data);
Modified: trunk/PCSC/src/winscard_msg_srv.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_msg_srv.c?rev=3260&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_msg_srv.c (original)
+++ trunk/PCSC/src/winscard_msg_srv.c Fri Jan 2 15:19:59 2009
@@ -84,7 +84,7 @@
* @retval -1 Can not establish the connection.
* @retval -1 Can not set the connection to non-blocking mode.
*/
-static int SHMProcessCommonChannelRequest(uint32_t *pdwClientID)
+static int SHMProcessCommonChannelRequest(/*@out@*/ uint32_t *pdwClientID)
{
socklen_t clnt_len;
int new_sock;
More information about the Pcsclite-cvs-commit
mailing list