[Pcsclite-cvs-commit] r2898 - in /trunk/PCSC/src: winscard_msg.h winscard_msg_srv.c winscard_svc.c

rousseau at users.alioth.debian.org rousseau at users.alioth.debian.org
Tue Apr 22 13:03:38 UTC 2008


Author: rousseau
Date: Tue Apr 22 13:03:37 2008
New Revision: 2898

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=2898
Log:
SHMProcessEventsContext(): use uint32_t dwClientID parameter instead of
uint32_t *pdwClientID since we do not need the address of the value but
the value itself

Modified:
    trunk/PCSC/src/winscard_msg.h
    trunk/PCSC/src/winscard_msg_srv.c
    trunk/PCSC/src/winscard_svc.c

Modified: trunk/PCSC/src/winscard_msg.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_msg.h?rev=2898&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_msg.h (original)
+++ trunk/PCSC/src/winscard_msg.h Tue Apr 22 13:03:37 2008
@@ -335,7 +335,7 @@
 	int32_t SHMClientSetupSession(uint32_t *);
 	int32_t SHMClientCloseSession(uint32_t);
 	int32_t SHMInitializeCommonSegment(void);
-	int32_t SHMProcessEventsContext(uint32_t *, psharedSegmentMsg, int32_t);
+	int32_t SHMProcessEventsContext(uint32_t, psharedSegmentMsg, int32_t);
 	int32_t SHMProcessEventsServer(uint32_t *, int32_t);
 	int32_t SHMMessageSend(void *buffer, uint64_t buffer_size, int32_t filedes,
 		int32_t blockAmount);

Modified: trunk/PCSC/src/winscard_msg_srv.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_msg_srv.c?rev=2898&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_msg_srv.c (original)
+++ trunk/PCSC/src/winscard_msg_srv.c Tue Apr 22 13:03:37 2008
@@ -236,7 +236,8 @@
  *
  * Called by \c ContextThread().
  */
-INTERNAL int32_t SHMProcessEventsContext(uint32_t *pdwClientID, psharedSegmentMsg msgStruct, int32_t blocktime)
+INTERNAL int32_t SHMProcessEventsContext(uint32_t dwClientID,
+	psharedSegmentMsg msgStruct, int32_t blocktime)
 {
 	fd_set read_fd;
 	int selret, rv;
@@ -246,9 +247,9 @@
 	tv.tv_usec = 0;
 
 	FD_ZERO(&read_fd);
-	FD_SET(*pdwClientID, &read_fd);
-
-	selret = select(*pdwClientID + 1, &read_fd, (fd_set *) NULL,
+	FD_SET(dwClientID, &read_fd);
+
+	selret = select(dwClientID + 1, &read_fd, (fd_set *) NULL,
 		(fd_set *) NULL, &tv);
 
 	if (selret < 0)
@@ -262,21 +263,20 @@
 		/* timeout */
 		return 2;
 
-	if (FD_ISSET(*pdwClientID, &read_fd))
+	if (FD_ISSET(dwClientID, &read_fd))
 	{
 		/*
 		 * Return the current handle
 		 */
-		rv = SHMMessageReceive(msgStruct, sizeof(*msgStruct), *pdwClientID,
+		rv = SHMMessageReceive(msgStruct, sizeof(*msgStruct), dwClientID,
 				       PCSCLITE_SERVER_ATTEMPTS);
 
 		if (rv == -1)
 		{	/* The client has died */
-			Log2(PCSC_LOG_DEBUG, "Client has disappeared: %d",
-				*pdwClientID);
+			Log2(PCSC_LOG_DEBUG, "Client has disappeared: %d", dwClientID);
 			msgStruct->mtype = CMD_CLIENT_DIED;
 			msgStruct->command = 0;
-			SYS_CloseFile(*pdwClientID);
+			SYS_CloseFile(dwClientID);
 
 			return 0;
 		}
@@ -284,8 +284,7 @@
 		/*
 		 * Set the identifier handle
 		 */
-		Log2(PCSC_LOG_DEBUG, "correctly processed client: %d",
-			*pdwClientID);
+		Log2(PCSC_LOG_DEBUG, "correctly processed client: %d", dwClientID);
 		return 1;
 	}
 

Modified: trunk/PCSC/src/winscard_svc.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_svc.c?rev=2898&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_svc.c (original)
+++ trunk/PCSC/src/winscard_svc.c Tue Apr 22 13:03:37 2008
@@ -132,7 +132,7 @@
 
 	while (1)
 	{
-		switch (rv = SHMProcessEventsContext(&psContext[dwContextIndex].dwClientID, &msgStruct, 0))
+		switch (rv = SHMProcessEventsContext(psContext[dwContextIndex].dwClientID, &msgStruct, 0))
 		{
 		case 0:
 			if (msgStruct.mtype == CMD_CLIENT_DIED)




More information about the Pcsclite-cvs-commit mailing list