[Pcsclite-git-commit] [PCSC] 03/16: EHDestroyEventHandler() returns void now

[Ludovic Rousseau]

This is an automated email from the git hooks/post-receive script.

rousseau pushed a commit to branch master
in repository PCSC.

commit 2d64467399d286e79328d0f5caba7f67692dd0da
Author: Ludovic Rousseau <ludovic.rousseau at free.fr>
Date:   Thu May 11 14:31:18 2017 +0200

    EHDestroyEventHandler() returns void now
    
    The value returned by EHDestroyEventHandler() was ignored.
    Now the EHDestroyEventHandler() function returns void.
---
 src/eventhandler.c  | 6 +++---
 src/eventhandler.h  | 2 +-
 src/readerfactory.c | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/eventhandler.c b/src/eventhandler.c
index 66158a2..4901dbc 100644
--- a/src/eventhandler.c
+++ b/src/eventhandler.c
@@ -156,7 +156,7 @@ LONG EHDeinitializeEventStructures(void)
 	return SCARD_S_SUCCESS;
 }
 
-LONG EHDestroyEventHandler(READER_CONTEXT * rContext)
+void EHDestroyEventHandler(READER_CONTEXT * rContext)
 {
 	int rv;
 	DWORD dwGetSize;
@@ -165,7 +165,7 @@ LONG EHDestroyEventHandler(READER_CONTEXT * rContext)
 	if ('\0' == rContext->readerState->readerName[0])
 	{
 		Log1(PCSC_LOG_INFO, "Thread already stomped.");
-		return SCARD_S_SUCCESS;
+		return;
 	}
 
 	/*
@@ -215,7 +215,7 @@ LONG EHDestroyEventHandler(READER_CONTEXT * rContext)
 
 	Log1(PCSC_LOG_INFO, "Thread stomped.");
 
-	return SCARD_S_SUCCESS;
+	return;
 }
 
 LONG EHSpawnEventHandler(READER_CONTEXT * rContext)
diff --git a/src/eventhandler.h b/src/eventhandler.h
index 5d023bc..e459e91 100644
--- a/src/eventhandler.h
+++ b/src/eventhandler.h
@@ -65,7 +65,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	LONG EHInitializeEventStructures(void);
 	LONG EHDeinitializeEventStructures(void);
 	LONG EHSpawnEventHandler(READER_CONTEXT *);
-	LONG EHDestroyEventHandler(READER_CONTEXT *);
+	void EHDestroyEventHandler(READER_CONTEXT *);
 
 /** One application is using the reader */
 #define PCSCLITE_SHARING_LAST_CONTEXT       1
diff --git a/src/readerfactory.c b/src/readerfactory.c
index 5b61ca1..b4e1f2c 100644
--- a/src/readerfactory.c
+++ b/src/readerfactory.c
@@ -617,7 +617,7 @@ LONG removeReader(READER_CONTEXT * sContext)
 {
 	/* Try to destroy the thread */
 	if (sContext -> pthThread)
-		(void)EHDestroyEventHandler(sContext);
+		EHDestroyEventHandler(sContext);
 
 	if ((NULL == sContext->pMutex) || (NULL == sContext->pFeeds))
 	{

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pcsclite/PCSC.git