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

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Mon Aug 11 13:40:53 2008
New Revision: 3087

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=3087
Log:
use SYS_RemoveFile() instead of SYS_Unlink()

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

Modified: trunk/PCSC/src/pcscdaemon.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/pcscdaemon.c?rev=3087&op=diff
==============================================================================
--- trunk/PCSC/src/pcscdaemon.c (original)
+++ trunk/PCSC/src/pcscdaemon.c Mon Aug 11 13:40:53 2008
@@ -533,19 +533,19 @@
 {
 	int rv;
 
-	rv = SYS_Unlink(PCSCLITE_PUBSHM_FILE);
+	rv = SYS_RemoveFile(PCSCLITE_PUBSHM_FILE);
 	if (rv != 0)
-		Log2(PCSC_LOG_ERROR, "Cannot unlink " PCSCLITE_PUBSHM_FILE ": %s",
+		Log2(PCSC_LOG_ERROR, "Cannot remove " PCSCLITE_PUBSHM_FILE ": %s",
 			strerror(errno));
 
-	rv = SYS_Unlink(PCSCLITE_CSOCK_NAME);
+	rv = SYS_RemoveFile(PCSCLITE_CSOCK_NAME);
 	if (rv != 0)
-		Log2(PCSC_LOG_ERROR, "Cannot unlink " PCSCLITE_CSOCK_NAME ": %s",
+		Log2(PCSC_LOG_ERROR, "Cannot remove " PCSCLITE_CSOCK_NAME ": %s",
 			strerror(errno));
 
-	rv = SYS_Unlink(PCSCLITE_RUN_PID);
+	rv = SYS_RemoveFile(PCSCLITE_RUN_PID);
 	if (rv != 0)
-		Log2(PCSC_LOG_ERROR, "Cannot unlink " PCSCLITE_RUN_PID ": %s",
+		Log2(PCSC_LOG_ERROR, "Cannot remove " PCSCLITE_RUN_PID ": %s",
 			strerror(errno));
 }
 

Modified: trunk/PCSC/src/winscard_msg.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_msg.c?rev=3087&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_msg.c (original)
+++ trunk/PCSC/src/winscard_msg.c Mon Aug 11 13:40:53 2008
@@ -478,6 +478,6 @@
 INTERNAL void SHMCleanupSharedSegment(int sockValue, const char *pcFilePath)
 {
 	SYS_CloseFile(sockValue);
-	SYS_Unlink(pcFilePath);
-}
-
+	SYS_RemoveFile(pcFilePath);
+}
+

Modified: trunk/PCSC/src/winscard_msg_srv.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_msg_srv.c?rev=3087&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_msg_srv.c (original)
+++ trunk/PCSC/src/winscard_msg_srv.c Mon Aug 11 13:40:53 2008
@@ -124,7 +124,7 @@
 	serv_adr.sun_family = AF_UNIX;
 	strncpy(serv_adr.sun_path, PCSCLITE_CSOCK_NAME,
 		sizeof(serv_adr.sun_path));
-	SYS_Unlink(PCSCLITE_CSOCK_NAME);
+	SYS_RemoveFile(PCSCLITE_CSOCK_NAME);
 
 	if (bind(commonSocket, (struct sockaddr *) &serv_adr,
 			sizeof(serv_adr.sun_family) + strlen(serv_adr.sun_path) + 1) < 0)