[Pcsclite-cvs-commit] PCSC/src winscard_msg.c,1.11,1.12
sauveron-guest@quantz.debian.org
sauveron-guest@quantz.debian.org
Wed, 24 Sep 2003 16:16:01 +0200
Update of /cvsroot/pcsclite/PCSC/src
In directory quantz:/tmp/cvs-serv2665/src
Modified Files:
winscard_msg.c
Log Message:
Some clean up on the debug message and indentation.
Index: winscard_msg.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/winscard_msg.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- winscard_msg.c 23 Sep 2003 23:57:50 -0000 1.11
+++ winscard_msg.c 24 Sep 2003 14:15:59 -0000 1.12
@@ -60,8 +60,7 @@
if ((appSocket = socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
{
- DebugLogB
- ("SHMInitializeSharedSegment: Error: create on client socket: %s",
+ DebugLogB("SHMInitializeSharedSegment: Error: create on client socket: %s",
strerror(errno));
return -1;
}
@@ -71,13 +70,10 @@
sizeof(svc_addr.sun_path));
if (connect(appSocket, (struct sockaddr *) &svc_addr,
- sizeof(svc_addr.sun_family) + strlen(svc_addr.sun_path) + 1) <
- 0)
+ sizeof(svc_addr.sun_family) + strlen(svc_addr.sun_path) + 1) < 0)
{
- DebugLogB
- ("SHMInitializeSharedSegment: Error: connect to client socket: %s",
+ DebugLogB("SHMInitializeSharedSegment: Error: connect to client socket: %s",
strerror(errno));
-
SYS_CloseFile(appSocket);
return -1;
}
@@ -85,8 +81,8 @@
one = 1;
if (ioctl(appSocket, FIONBIO, &one) < 0)
{
- DebugLogB("SHMInitializeSharedSegment: Error: cannot set socket "
- "nonblocking: %s", strerror(errno));
+ DebugLogB("SHMInitializeSharedSegment: Error: cannot set socket nonblocking: %s",
+ strerror(errno));
SYS_CloseFile(appSocket);
return -1;
}
@@ -116,8 +112,7 @@
*/
if ((commonSocket = socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
{
- DebugLogB
- ("SHMInitializeSharedSegment: Unable to create common socket: %s",
+ DebugLogB("SHMInitializeSharedSegment: Unable to create common socket: %s",
strerror(errno));
return -1;
}
@@ -128,11 +123,9 @@
SYS_Unlink(PCSCLITE_CSOCK_NAME);
if (bind(commonSocket, (struct sockaddr *) &serv_adr,
- sizeof(serv_adr.sun_family) + strlen(serv_adr.sun_path) + 1) <
- 0)
+ sizeof(serv_adr.sun_family) + strlen(serv_adr.sun_path) + 1) < 0)
{
- DebugLogB
- ("SHMInitializeSharedSegment: Unable to bind common socket: %s",
+ DebugLogB("SHMInitializeSharedSegment: Unable to bind common socket: %s",
strerror(errno));
SHMCleanupSharedSegment(commonSocket, PCSCLITE_CSOCK_NAME);
return -1;
@@ -140,8 +133,7 @@
if (listen(commonSocket, 1) < 0)
{
- DebugLogB
- ("SHMInitializeSharedSegment: Unable to listen common socket: %s",
+ DebugLogB("SHMInitializeSharedSegment: Unable to listen common socket: %s",
strerror(errno));
SHMCleanupSharedSegment(commonSocket, PCSCLITE_CSOCK_NAME);
return -1;
@@ -168,8 +160,7 @@
if ((new_sock = accept(commonSocket, (struct sockaddr *) &clnt_addr,
&clnt_len)) < 0)
{
- DebugLogB
- ("SHMProcessCommonChannelRequest: ER: Accept on common socket: %s",
+ DebugLogB("SHMProcessCommonChannelRequest: ER: Accept on common socket: %s",
strerror(errno));
return -1;
}
@@ -402,8 +393,7 @@
*/
if (errno != EINTR)
{
- DebugLogB
- ("SHMProcessEvents: Select returns with failure: %s",
+ DebugLogB("SHMProcessEvents: Select returns with failure: %s",
strerror(errno));
retval = -1;
break;
@@ -516,8 +506,7 @@
*/
if (errno != EINTR)
{
- DebugLogB
- ("SHMProcessEvents: Select returns with failure: %s",
+ DebugLogB("SHMProcessEvents: Select returns with failure: %s",
strerror(errno));
retval = -1;
break;