[Pcsclite-git-commit] [PCSC] 09/16: RFSetReaderEventState() 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 784f217350d8657c69e62aea2a1a483b288df09e
Author: Ludovic Rousseau <ludovic.rousseau at free.fr>
Date:   Thu May 11 14:52:43 2017 +0200

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

diff --git a/src/readerfactory.c b/src/readerfactory.c
index 786d0d9..7ae33cd 100644
--- a/src/readerfactory.c
+++ b/src/readerfactory.c
@@ -1254,7 +1254,7 @@ end:
 	return rv;
 }
 
-LONG RFSetReaderEventState(READER_CONTEXT * rContext, DWORD dwEvent)
+void RFSetReaderEventState(READER_CONTEXT * rContext, DWORD dwEvent)
 {
 	/* Set all the handles for that reader to the event */
 	int list_index, listSize;
@@ -1284,7 +1284,7 @@ LONG RFSetReaderEventState(READER_CONTEXT * rContext, DWORD dwEvent)
 		rContext->LockCount = 0;
 	}
 
-	return SCARD_S_SUCCESS;
+	return;
 }
 
 LONG RFCheckReaderEventState(READER_CONTEXT * rContext, SCARDHANDLE hCard)
diff --git a/src/readerfactory.h b/src/readerfactory.h
index 8eeb00e..d83ce58 100644
--- a/src/readerfactory.h
+++ b/src/readerfactory.h
@@ -166,7 +166,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	LONG RFDestroyReaderHandle(SCARDHANDLE hCard);
 	LONG RFAddReaderHandle(READER_CONTEXT *, SCARDHANDLE);
 	LONG RFRemoveReaderHandle(READER_CONTEXT *, SCARDHANDLE);
-	LONG RFSetReaderEventState(READER_CONTEXT *, DWORD);
+	void RFSetReaderEventState(READER_CONTEXT *, DWORD);
 	LONG RFCheckReaderEventState(READER_CONTEXT *, SCARDHANDLE);
 	LONG RFClearReaderEventState(READER_CONTEXT *, SCARDHANDLE);
 	LONG RFCheckReaderStatus(READER_CONTEXT *);
diff --git a/src/winscard.c b/src/winscard.c
index a8f0b30..a08dac3 100644
--- a/src/winscard.c
+++ b/src/winscard.c
@@ -583,7 +583,7 @@ LONG SCardReconnect(SCARDHANDLE hCard, DWORD dwShareMode,
 		/*
 		 * Notify the card has been reset
 		 */
-		(void)RFSetReaderEventState(rContext, SCARD_RESET);
+		RFSetReaderEventState(rContext, SCARD_RESET);
 
 		/*
 		 * Currently pcsc-lite keeps the card powered constantly
@@ -888,7 +888,7 @@ LONG SCardDisconnect(SCARDHANDLE hCard, DWORD dwDisposition)
 		/*
 		 * Notify the card has been reset
 		 */
-		(void)RFSetReaderEventState(rContext, SCARD_RESET);
+		RFSetReaderEventState(rContext, SCARD_RESET);
 
 		dwAtrLen = sizeof(rContext->readerState->cardAtr);
 		if (SCARD_RESET_CARD == dwDisposition)
@@ -1164,7 +1164,7 @@ LONG SCardEndTransaction(SCARDHANDLE hCard, DWORD dwDisposition)
 		/*
 		 * Notify the card has been reset
 		 */
-		(void)RFSetReaderEventState(rContext, SCARD_RESET);
+		RFSetReaderEventState(rContext, SCARD_RESET);
 
 		/*
 		 * Set up the status bit masks on readerState

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