[Pcsclite-cvs-commit] PCSC/src winscard_clnt.c,1.33,1.34

rousseau@haydn.debian.org rousseau@haydn.debian.org


Update of /cvsroot/pcsclite/PCSC/src
In directory haydn:/tmp/cvs-serv12376

Modified Files:
	winscard_clnt.c 
Log Message:
declare internal only function as "static" (and two one-line functions as "inline")


Index: winscard_clnt.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/winscard_clnt.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- winscard_clnt.c	21 Apr 2004 21:42:33 -0000	1.33
+++ winscard_clnt.c	26 May 2004 21:16:16 -0000	1.34
@@ -87,13 +87,13 @@
 static LONG SCardGetSetAttrib(SCARDHANDLE hCard, int command, DWORD dwAttrId,
 	LPBYTE pbAttr, LPDWORD pcbAttrLen);
 
-static LONG SCardCheckDaemonAvailability();
+static LONG SCardCheckDaemonAvailability(void);
 
 /*
  * Thread safety functions
  */
-static LONG SCardLockThread();
-static LONG SCardUnlockThread();
+static LONG SCardLockThread(void);
+static LONG SCardUnlockThread(void);
 
 static LONG SCardEstablishContextTH(DWORD, LPCVOID, LPCVOID, LPSCARDCONTEXT);
 
@@ -1646,7 +1646,7 @@
 		&cbAttrLen);
 }
 
-LONG SCardGetSetAttrib(SCARDHANDLE hCard, int command, DWORD dwAttrId,
+static LONG SCardGetSetAttrib(SCARDHANDLE hCard, int command, DWORD dwAttrId,
 	LPBYTE pbAttr, LPDWORD pcbAttrLen)
 {
 	LONG rv;
@@ -2115,7 +2115,8 @@
  * Functions for managing hCard values returned from SCardConnect.
  */
 
-LONG SCardAddHandle(SCARDHANDLE hCard, DWORD dwContextIndex, LPSTR readerName)
+static LONG SCardAddHandle(SCARDHANDLE hCard, DWORD dwContextIndex,
+	LPSTR readerName)
 {
 	int i;
 
@@ -2132,7 +2133,7 @@
 	return SCARD_E_NO_MEMORY;
 }
 
-LONG SCardRemoveHandle(SCARDHANDLE hCard)
+static LONG SCardRemoveHandle(SCARDHANDLE hCard)
 {
 	DWORD dwContextIndice, dwChannelIndice;
 	LONG rv;
@@ -2193,7 +2194,7 @@
  * function
  */
 
-LONG SCardLockThread()
+inline static LONG SCardLockThread(void)
 {
 	return SYS_MutexLock(&clientMutex);
 }
@@ -2203,12 +2204,12 @@
  * library
  */
 
-LONG SCardUnlockThread()
+inline static LONG SCardUnlockThread(void)
 {
 	return SYS_MutexUnLock(&clientMutex);
 }
 
-LONG SCardCheckDaemonAvailability()
+static LONG SCardCheckDaemonAvailability(void)
 {
 	LONG rv;
 	struct stat statBuffer;