[Pcsclite-cvs-commit] r3259 - in /trunk/PCSC/src: PCSC/winscard.h eventhandler.h hotplug_libhal.c sys_unix.c thread_generic.h utils.h

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Fri Jan  2 14:32:44 2009
New Revision: 3259

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=3259
Log:
tag potentially NULL paramater or returned value as /*@null@*/

Modified:
    trunk/PCSC/src/PCSC/winscard.h
    trunk/PCSC/src/eventhandler.h
    trunk/PCSC/src/hotplug_libhal.c
    trunk/PCSC/src/sys_unix.c
    trunk/PCSC/src/thread_generic.h
    trunk/PCSC/src/utils.h

Modified: trunk/PCSC/src/PCSC/winscard.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/PCSC/winscard.h?rev=3259&op=diff
==============================================================================
--- trunk/PCSC/src/PCSC/winscard.h (original)
+++ trunk/PCSC/src/PCSC/winscard.h Fri Jan  2 14:32:44 2009
@@ -28,7 +28,8 @@
 #endif
 
 	PCSC_API LONG SCardEstablishContext(DWORD dwScope,
-		LPCVOID pvReserved1, LPCVOID pvReserved2, LPSCARDCONTEXT phContext);
+		/*@null@*/ LPCVOID pvReserved1, /*@null@*/ LPCVOID pvReserved2,
+		LPSCARDCONTEXT phContext);
 
 	PCSC_API LONG SCardReleaseContext(SCARDCONTEXT hContext);
 
@@ -56,10 +57,10 @@
 	PCSC_API LONG SCardCancelTransaction(SCARDHANDLE hCard);
 
 	PCSC_API LONG SCardStatus(SCARDHANDLE hCard,
-		LPSTR mszReaderName, LPDWORD pcchReaderLen,
-		LPDWORD pdwState,
-		LPDWORD pdwProtocol,
-		LPBYTE pbAtr, LPDWORD pcbAtrLen);
+		/*@null@*/ LPSTR mszReaderName, /*@null@*/ LPDWORD pcchReaderLen,
+		/*@null@*/ LPDWORD pdwState,
+		/*@null@*/ LPDWORD pdwProtocol,
+		/*@null@*/ LPBYTE pbAtr, /*@null@*/ LPDWORD pcbAtrLen);
 
 	PCSC_API LONG SCardGetStatusChange(SCARDCONTEXT hContext,
 		DWORD dwTimeout,
@@ -79,8 +80,8 @@
 		LPSTR mszGroups, LPDWORD pcchGroups);
 
 	PCSC_API LONG SCardListReaders(SCARDCONTEXT hContext,
-		LPCSTR mszGroups,
-		LPSTR mszReaders, LPDWORD pcchReaders);
+		/*@null@*/ LPCSTR mszGroups,
+		/*@null@*/ LPSTR mszReaders, LPDWORD pcchReaders);
 
 	PCSC_API LONG SCardFreeMemory(SCARDCONTEXT hContext, LPCVOID pvMem);
 

Modified: trunk/PCSC/src/eventhandler.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/eventhandler.h?rev=3259&op=diff
==============================================================================
--- trunk/PCSC/src/eventhandler.h (original)
+++ trunk/PCSC/src/eventhandler.h Fri Jan  2 14:32:44 2009
@@ -43,7 +43,8 @@
 	READER_STATE, *PREADER_STATE;
 
 	LONG EHInitializeEventStructures(void);
-	LONG EHSpawnEventHandler(PREADER_CONTEXT, RESPONSECODE (*)(DWORD));
+	LONG EHSpawnEventHandler(PREADER_CONTEXT,
+		/*@null@*/ RESPONSECODE (*)(DWORD));
 	LONG EHDestroyEventHandler(PREADER_CONTEXT);
 
 #ifdef __cplusplus

Modified: trunk/PCSC/src/hotplug_libhal.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/hotplug_libhal.c?rev=3259&op=diff
==============================================================================
--- trunk/PCSC/src/hotplug_libhal.c (original)
+++ trunk/PCSC/src/hotplug_libhal.c Fri Jan  2 14:32:44 2009
@@ -270,7 +270,8 @@
 } /* HPStopHotPluggables */
 
 
-static struct _driverTracker *get_driver(LibHalContext *ctx, const char *udi)
+/*@null@*/ static struct _driverTracker *get_driver(LibHalContext *ctx,
+	const char *udi)
 {
 	DBusError error;
 	int i;

Modified: trunk/PCSC/src/sys_unix.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/sys_unix.c?rev=3259&op=diff
==============================================================================
--- trunk/PCSC/src/sys_unix.c (original)
+++ trunk/PCSC/src/sys_unix.c Fri Jan  2 14:32:44 2009
@@ -249,7 +249,7 @@
  *
  * @return Address of the memory map.
  */
-INTERNAL void *SYS_PublicMemoryMap(int iSize, int iFid, int iOffset)
+/*@null@*/ INTERNAL void *SYS_PublicMemoryMap(int iSize, int iFid, int iOffset)
 {
 
 	void *vAddress;

Modified: trunk/PCSC/src/thread_generic.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/thread_generic.h?rev=3259&op=diff
==============================================================================
--- trunk/PCSC/src/thread_generic.h (original)
+++ trunk/PCSC/src/thread_generic.h Fri Jan  2 14:32:44 2009
@@ -51,11 +51,12 @@
 	int SYS_MutexLock(PCSCLITE_MUTEX_T);
 	int SYS_MutexTryLock(PCSCLITE_MUTEX_T);
 	int SYS_MutexUnLock(PCSCLITE_MUTEX_T);
-	int SYS_ThreadCreate(PCSCLITE_THREAD_T *, int, PCSCLITE_THREAD_FUNCTION( ), LPVOID);
+	int SYS_ThreadCreate(PCSCLITE_THREAD_T *, int, PCSCLITE_THREAD_FUNCTION( ),
+		/*@null@*/ LPVOID);
 	int SYS_ThreadCancel(PCSCLITE_THREAD_T);
 	int SYS_ThreadDetach(PCSCLITE_THREAD_T);
-	int SYS_ThreadJoin(PCSCLITE_THREAD_T, LPVOID*);
-	int SYS_ThreadExit(LPVOID);
+	int SYS_ThreadJoin(PCSCLITE_THREAD_T, /*@null@*/ LPVOID*);
+	int SYS_ThreadExit(/*@null@*/ LPVOID);
 	PCSCLITE_THREAD_T SYS_ThreadSelf(void);
 	int SYS_ThreadEqual(PCSCLITE_THREAD_T *, PCSCLITE_THREAD_T *);
 	int SYS_ThreadSetCancelType(int, int *);

Modified: trunk/PCSC/src/utils.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/utils.h?rev=3259&op=diff
==============================================================================
--- trunk/PCSC/src/utils.h (original)
+++ trunk/PCSC/src/utils.h Fri Jan  2 14:32:44 2009
@@ -21,7 +21,7 @@
 /* defined in winscard_clnt.c */
 LONG SCardCheckDaemonAvailability(void);
 
-int StatSynchronize(struct pubReaderStatesList *readerState);
+int StatSynchronize(/*@null@*/ struct pubReaderStatesList *readerState);
 
 int CheckForOpenCT(void);