[Pcsclite-cvs-commit] r2073 - in trunk/PCSC: doc src

[Ludovic Rousseau]

Author: rousseau
Date: 2006-06-06 09:34:09 +0000 (Tue, 06 Jun 2006)
New Revision: 2073

Modified:
   trunk/PCSC/doc/pcsc-lite.tex
   trunk/PCSC/src/readerfactory.c
   trunk/PCSC/src/winscard_clnt.c
Log:
do not cast malloc() return value.


Modified: trunk/PCSC/doc/pcsc-lite.tex
===================================================================
--- trunk/PCSC/doc/pcsc-lite.tex	2006-06-06 09:31:07 UTC (rev 2072)
+++ trunk/PCSC/doc/pcsc-lite.tex	2006-06-06 09:34:09 UTC (rev 2073)
@@ -367,7 +367,7 @@
 
 rv = SCardEstablishContext(SCARD_SCOPE_SYSTEM, NULL, NULL, &hContext);
 rv = SCardListReaders(hContext, NULL, NULL, &dwReaders);
-mszReaders = (LPSTR)malloc(sizeof(char)*dwReaders);
+mszReaders = malloc(sizeof(char)*dwReaders);
 rv = SCardListReaders(hContext, NULL, mszReaders, &dwReaders);
 \end{verbatim}
 
@@ -421,7 +421,7 @@
 
 rv = SCardEstablishContext(SCARD_SCOPE_SYSTEM, NULL, NULL, &hContext);
 rv = SCardListReaderGroups(hContext, NULL, &dwGroups);
-mszGroups = (LPSTR)malloc(sizeof(char)*dwGroups);
+mszGroups = malloc(sizeof(char)*dwGroups);
 rv = SCardListReaderGroups(hContext, mszGroups, &dwGroups);
 \end{verbatim}
 

Modified: trunk/PCSC/src/readerfactory.c
===================================================================
--- trunk/PCSC/src/readerfactory.c	2006-06-06 09:31:07 UTC (rev 2072)
+++ trunk/PCSC/src/readerfactory.c	2006-06-06 09:34:09 UTC (rev 2073)
@@ -211,8 +211,7 @@
 
 	if ((sReadersContexts[dwContext])->pdwFeeds == NULL)
 	{
-		(sReadersContexts[dwContext])->pdwFeeds = 
-		  (DWORD *)malloc(sizeof(DWORD));
+		(sReadersContexts[dwContext])->pdwFeeds = malloc(sizeof(DWORD));
 
 		/* Initialize pdwFeeds to 1, otherwise multiple 
 		   cloned readers will cause pcscd to crash when 
@@ -231,8 +230,7 @@
 
 	if ((sReadersContexts[dwContext])->pdwMutex == NULL)
 	{
-		(sReadersContexts[dwContext])->pdwMutex = 
-		  (DWORD *)malloc(sizeof(DWORD));
+		(sReadersContexts[dwContext])->pdwMutex = malloc(sizeof(DWORD));
 
 		*(sReadersContexts[dwContext])->pdwMutex = 1;
 	}
@@ -407,8 +405,7 @@
 				(PCSCLITE_MUTEX_T) malloc(sizeof(PCSCLITE_MUTEX));
 			SYS_MutexInit((sReadersContexts[dwContextB])->mMutex);
 
-			(sReadersContexts[dwContextB])->pdwMutex = 
-				(DWORD *)malloc(sizeof(DWORD));
+			(sReadersContexts[dwContextB])->pdwMutex = malloc(sizeof(DWORD));
 			*(sReadersContexts[dwContextB])->pdwMutex = 1;
 		}
 		else

Modified: trunk/PCSC/src/winscard_clnt.c
===================================================================
--- trunk/PCSC/src/winscard_clnt.c	2006-06-06 09:31:07 UTC (rev 2072)
+++ trunk/PCSC/src/winscard_clnt.c	2006-06-06 09:34:09 UTC (rev 2073)
@@ -2785,7 +2785,7 @@
  * ...
  * rv = SCardEstablishContext(SCARD_SCOPE_SYSTEM, NULL, NULL, &hContext);
  * rv = SCardListReaders(hContext, NULL, NULL, &dwReaders);
- * mszReaders = (LPSTR)malloc(sizeof(char)*dwReaders);
+ * mszReaders = malloc(sizeof(char)*dwReaders);
  * rv = SCardListReaders(hContext, NULL, mszReaders, &dwReaders); 
  * @endcode
  */
@@ -2889,7 +2889,7 @@
  * ...
  * rv = SCardEstablishContext(SCARD_SCOPE_SYSTEM, NULL, NULL, &hContext);
  * rv = SCardListReaderGroups(hContext, NULL, &dwGroups);
- * mszGroups = (LPSTR)malloc(sizeof(char)*dwGroups);
+ * mszGroups = malloc(sizeof(char)*dwGroups);
  * rv = SCardListReaderGroups(hContext, mszGroups, &dwGroups);
  * @endcode
  */