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

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Mon Nov  8 14:45:57 2010
New Revision: 5390

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5390
Log:
Remove CleanupSharedSegment() and do not call it anymore

The function is not about shared segment any more
The file PCSCLITE_CSOCK_NAME will be removed in clean_temp_files() at
exit anyway

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

Modified: trunk/PCSC/src/winscard_msg.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_msg.c?rev=5390&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_msg.c (original)
+++ trunk/PCSC/src/winscard_msg.c Mon Nov  8 14:45:57 2010
@@ -51,21 +51,6 @@
 
 /* functions used by pcscd only */
 
-/**
- * @brief Closes the communications channel used by the server to talk to the
- * clients.
- *
- * The socket used is closed and the file it is bound to is removed.
- *
- * @param[in] sockValue Socket to be closed.
- * @param[in] pcFilePath File used by the socket.
- */
-INTERNAL void CleanupSharedSegment(int sockValue, const char *pcFilePath)
-{
-	(void)close(sockValue);
-	(void)remove(pcFilePath);
-}
-
 #else
 
 /* functions used by libpcsclite only */

Modified: trunk/PCSC/src/winscard_msg.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_msg.h?rev=5390&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_msg.h (original)
+++ trunk/PCSC/src/winscard_msg.h Mon Nov  8 14:45:57 2010
@@ -256,7 +256,6 @@
 	 */
 
 #ifdef PCSCD
-	void CleanupSharedSegment(int32_t, const char *);
 	int32_t InitializeSocket(void);
 	int32_t ProcessEventsServer(/*@out@*/ uint32_t *);
 #else

Modified: trunk/PCSC/src/winscard_msg_srv.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_msg_srv.c?rev=5390&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_msg_srv.c (original)
+++ trunk/PCSC/src/winscard_msg_srv.c Mon Nov  8 14:45:57 2010
@@ -119,7 +119,6 @@
 	{
 		Log2(PCSC_LOG_CRITICAL, "Unable to bind common socket: %s",
 			strerror(errno));
-		CleanupSharedSegment(commonSocket, PCSCLITE_CSOCK_NAME);
 		return -1;
 	}
 
@@ -127,7 +126,6 @@
 	{
 		Log2(PCSC_LOG_CRITICAL, "Unable to listen common socket: %s",
 			strerror(errno));
-		CleanupSharedSegment(commonSocket, PCSCLITE_CSOCK_NAME);
 		return -1;
 	}