[Pcsclite-cvs-commit] r2939 - /trunk/PCSC/src/readerfactory.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Fri May  9 15:03:44 2008
New Revision: 2939

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=2939
Log:
RFAddReader(): in case of error call RFRemoveReader() to free all
resources instead of duplicating part of the needed code.

Modified:
    trunk/PCSC/src/readerfactory.c

Modified: trunk/PCSC/src/readerfactory.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/readerfactory.c?rev=2939&op=diff
==============================================================================
--- trunk/PCSC/src/readerfactory.c (original)
+++ trunk/PCSC/src/readerfactory.c Fri May  9 15:03:44 2008
@@ -245,47 +245,9 @@
 	rv = RFInitializeReader(sReadersContexts[dwContext]);
 	if (rv != SCARD_S_SUCCESS)
 	{
-		/*
-		 * Cannot connect to reader exit gracefully
-		 */
-		/*
-		 * Clean up so it is not using needed space
-		 */
+		/* Cannot connect to reader. Exit gracefully */
 		Log2(PCSC_LOG_ERROR, "%s init failed.", lpcReader);
-
-		(sReadersContexts[dwContext])->dwVersion = 0;
-		(sReadersContexts[dwContext])->dwPort = 0;
-		(sReadersContexts[dwContext])->vHandle = NULL;
-		(sReadersContexts[dwContext])->readerState = NULL;
-		(sReadersContexts[dwContext])->dwIdentity = 0;
-
-		/*
-		 * Destroy and free the mutex
-		 */
-		if (*(sReadersContexts[dwContext])->pdwMutex == 1)
-		{
-			SYS_MutexDestroy((sReadersContexts[dwContext])->mMutex);
-			free((sReadersContexts[dwContext])->mMutex);
-		}
-
-		*(sReadersContexts[dwContext])->pdwMutex -= 1;
-
-		if (*(sReadersContexts[dwContext])->pdwMutex == 0)
-		{
-			free((sReadersContexts[dwContext])->pdwMutex);
-			(sReadersContexts[dwContext])->pdwMutex = NULL;
-		}
-
-		*(sReadersContexts[dwContext])->pdwFeeds -= 1;
-
-		if (*(sReadersContexts[dwContext])->pdwFeeds == 0)
-		{
-			free((sReadersContexts[dwContext])->pdwFeeds);
-			(sReadersContexts[dwContext])->pdwFeeds = NULL;
-		}
-
-		dwNumReadersContexts -= 1;
-
+		RFRemoveReader(lpcReader, dwPort);
 		return rv;
 	}
 
@@ -445,47 +407,8 @@
 		rv = RFInitializeReader(sReadersContexts[dwContextB]);
 		if (rv != SCARD_S_SUCCESS)
 		{
-			/*
-			 * Cannot connect to slot exit gracefully
-			 */
-			/*
-			 * Clean up so it is not using needed space
-			 */
-			Log2(PCSC_LOG_ERROR, "%s init failed.", lpcReader);
-
-			(sReadersContexts[dwContextB])->dwVersion = 0;
-			(sReadersContexts[dwContextB])->dwPort = 0;
-			(sReadersContexts[dwContextB])->vHandle = NULL;
-			(sReadersContexts[dwContextB])->readerState = NULL;
-			(sReadersContexts[dwContextB])->dwIdentity = 0;
-
-			/*
-			 * Destroy and free the mutex
-			 */
-			if (*(sReadersContexts[dwContextB])->pdwMutex == 1)
-			{
-				SYS_MutexDestroy((sReadersContexts[dwContextB])->mMutex);
-				free((sReadersContexts[dwContextB])->mMutex);
-			}
-
-			*(sReadersContexts[dwContextB])->pdwMutex -= 1;
-
-			if (*(sReadersContexts[dwContextB])->pdwMutex == 0)
-			{
-				free((sReadersContexts[dwContextB])->pdwMutex);
-				(sReadersContexts[dwContextB])->pdwMutex = NULL;
-			}
-
-			*(sReadersContexts[dwContextB])->pdwFeeds -= 1;
-
-			if (*(sReadersContexts[dwContextB])->pdwFeeds == 0)
-			{
-				free((sReadersContexts[dwContextB])->pdwFeeds);
-				(sReadersContexts[dwContextB])->pdwFeeds = NULL;
-			}
-
-			dwNumReadersContexts -= 1;
-
+			/* Cannot connect to slot. Exit gracefully */
+			RFRemoveReader(lpcReader, dwPort);
 			return rv;
 		}