[Pcsclite-cvs-commit] r5071 - in /trunk/PCSC/src: hotplug_libhal.c pcscdaemon.c utils.c winscard.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Mon Jul 26 13:33:56 2010
New Revision: 5071

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5071
Log:
Do not affect and check a variable on the same line

Modified:
    trunk/PCSC/src/hotplug_libhal.c
    trunk/PCSC/src/pcscdaemon.c
    trunk/PCSC/src/utils.c
    trunk/PCSC/src/winscard.c

Modified: trunk/PCSC/src/hotplug_libhal.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/hotplug_libhal.c?rev=5071&op=diff
==============================================================================
--- trunk/PCSC/src/hotplug_libhal.c (original)
+++ trunk/PCSC/src/hotplug_libhal.c Mon Jul 26 13:33:56 2010
@@ -546,7 +546,8 @@
 		return 1;
 	}
 
-	if ((hal_ctx = libhal_ctx_new()) == NULL)
+	hal_ctx = libhal_ctx_new();
+	if (hal_ctx == NULL)
 	{
 		Log1(PCSC_LOG_ERROR, "error: libhal_ctx_new");
 		return 1;

Modified: trunk/PCSC/src/pcscdaemon.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/pcscdaemon.c?rev=5071&op=diff
==============================================================================
--- trunk/PCSC/src/pcscdaemon.c (original)
+++ trunk/PCSC/src/pcscdaemon.c Mon Jul 26 13:33:56 2010
@@ -478,7 +478,8 @@
 		int f;
 		int mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;
 
-		if ((f = open(PCSCLITE_RUN_PID, O_RDWR | O_CREAT, mode)) != -1)
+		f = open(PCSCLITE_RUN_PID, O_RDWR | O_CREAT, mode);
+		if (f != -1)
 		{
 			char pid[PID_ASCII_SIZE];
 

Modified: trunk/PCSC/src/utils.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/utils.c?rev=5071&op=diff
==============================================================================
--- trunk/PCSC/src/utils.c (original)
+++ trunk/PCSC/src/utils.c Mon Jul 26 13:33:56 2010
@@ -37,7 +37,8 @@
 	/* pids are only 15 bits but 4294967296
 	 * (32 bits in case of a new system use it) is on 10 bytes
 	 */
-	if ((f = fopen(PCSCLITE_RUN_PID, "rb")) != NULL)
+	f = fopen(PCSCLITE_RUN_PID, "rb");
+	if (f != NULL)
 	{
 		char pid_ascii[PID_ASCII_SIZE];
 

Modified: trunk/PCSC/src/winscard.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard.c?rev=5071&op=diff
==============================================================================
--- trunk/PCSC/src/winscard.c (original)
+++ trunk/PCSC/src/winscard.c Mon Jul 26 13:33:56 2010
@@ -1010,7 +1010,8 @@
 	/*
 	 * Make sure some event has not occurred
 	 */
-	if ((rv = RFCheckReaderEventState(rContext, hCard)) != SCARD_S_SUCCESS)
+	rv = RFCheckReaderEventState(rContext, hCard);
+	if (rv != SCARD_S_SUCCESS)
 		return rv;
 
 	rv = RFLockSharing(hCard, rContext);
@@ -1055,7 +1056,8 @@
 	/*
 	 * Make sure some event has not occurred
 	 */
-	if ((rv = RFCheckReaderEventState(rContext, hCard)) != SCARD_S_SUCCESS)
+	rv = RFCheckReaderEventState(rContext, hCard);
+	if (rv != SCARD_S_SUCCESS)
 		return rv;
 
 	if (dwDisposition == SCARD_RESET_CARD ||
@@ -1196,7 +1198,8 @@
 	/*
 	 * Make sure some event has not occurred
 	 */
-	if ((rv = RFCheckReaderEventState(rContext, hCard)) != SCARD_S_SUCCESS)
+	rv = RFCheckReaderEventState(rContext, hCard);
+	if (rv != SCARD_S_SUCCESS)
 		return rv;
 
 	rv = RFUnlockSharing(hCard, rContext);
@@ -1224,7 +1227,8 @@
 	/*
 	 * Make sure no one has a lock on this reader
 	 */
-	if ((rv = RFCheckSharing(hCard, rContext)) != SCARD_S_SUCCESS)
+	rv = RFCheckSharing(hCard, rContext);
+	if (rv != SCARD_S_SUCCESS)
 		return rv;
 
 	/*
@@ -1246,7 +1250,8 @@
 	/*
 	 * Make sure some event has not occurred
 	 */
-	if ((rv = RFCheckReaderEventState(rContext, hCard)) != SCARD_S_SUCCESS)
+	rv = RFCheckReaderEventState(rContext, hCard);
+	if (rv != SCARD_S_SUCCESS)
 		return rv;
 
 	/*
@@ -1366,7 +1371,8 @@
 	/*
 	 * Make sure no one has a lock on this reader
 	 */
-	if ((rv = RFCheckSharing(hCard, rContext)) != SCARD_S_SUCCESS)
+	rv = RFCheckSharing(hCard, rContext);
+	if (rv != SCARD_S_SUCCESS)
 		return rv;
 
 	if (IFD_HVERSION_2_0 == rContext->version)
@@ -1416,7 +1422,8 @@
 	/*
 	 * Make sure no one has a lock on this reader
 	 */
-	if ((rv = RFCheckSharing(hCard, rContext)) != SCARD_S_SUCCESS)
+	rv = RFCheckSharing(hCard, rContext);
+	if (rv != SCARD_S_SUCCESS)
 		return rv;
 
 	/*
@@ -1433,7 +1440,8 @@
 	/*
 	 * Make sure some event has not occurred
 	 */
-	if ((rv = RFCheckReaderEventState(rContext, hCard)) != SCARD_S_SUCCESS)
+	rv = RFCheckReaderEventState(rContext, hCard);
+	if (rv != SCARD_S_SUCCESS)
 		return rv;
 
 	rv = IFDGetCapabilities(rContext, dwAttrId, pcbAttrLen, pbAttr);
@@ -1491,7 +1499,8 @@
 	/*
 	 * Make sure no one has a lock on this reader
 	 */
-	if ((rv = RFCheckSharing(hCard, rContext)) != SCARD_S_SUCCESS)
+	rv = RFCheckSharing(hCard, rContext);
+	if (rv != SCARD_S_SUCCESS)
 		return rv;
 
 	/*
@@ -1508,7 +1517,8 @@
 	/*
 	 * Make sure some event has not occurred
 	 */
-	if ((rv = RFCheckReaderEventState(rContext, hCard)) != SCARD_S_SUCCESS)
+	rv = RFCheckReaderEventState(rContext, hCard);
+	if (rv != SCARD_S_SUCCESS)
 		return rv;
 
 	rv = IFDSetCapabilities(rContext, dwAttrId, cbAttrLen, (PUCHAR)pbAttr);
@@ -1557,7 +1567,8 @@
 	/*
 	 * Make sure no one has a lock on this reader
 	 */
-	if ((rv = RFCheckSharing(hCard, rContext)) != SCARD_S_SUCCESS)
+	rv = RFCheckSharing(hCard, rContext);
+	if (rv != SCARD_S_SUCCESS)
 		return rv;
 
 	/*
@@ -1574,7 +1585,8 @@
 	/*
 	 * Make sure some event has not occurred
 	 */
-	if ((rv = RFCheckReaderEventState(rContext, hCard)) != SCARD_S_SUCCESS)
+	rv = RFCheckReaderEventState(rContext, hCard);
+	if (rv != SCARD_S_SUCCESS)
 		return rv;
 
 	/*