From e1ef4ec241e63d43c3433f3e122b4362116814c8 Mon Sep 17 00:00:00 2001
From: martin <martin@c6295689-39f2-0310-b995-f0e70906c6a9>
Date: Wed, 1 Mar 2006 09:45:09 +0000
Subject: [PATCH] Remove the disconnect action from internal reader api

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2861 c6295689-39f2-0310-b995-f0e70906c6a9
---
 src/libopensc/card.c          | 4 ++--
 src/libopensc/opensc.h        | 3 +--
 src/libopensc/reader-ctapi.c  | 3 +--
 src/libopensc/reader-openct.c | 4 ++--
 src/libopensc/reader-pcsc.c   | 3 +--
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/libopensc/card.c b/src/libopensc/card.c
index 51c0e06d..7efff171 100644
--- a/src/libopensc/card.c
+++ b/src/libopensc/card.c
@@ -220,7 +220,7 @@ int sc_connect_card(sc_reader_t *reader, int slot_id, sc_card_t **card_out)
 	SC_FUNC_RETURN(ctx, 1, 0);
 err:
 	if (connected)
-		reader->ops->disconnect(reader, slot, 0);
+		reader->ops->disconnect(reader, slot);
 	if (card != NULL)
 		sc_card_free(card);
 	SC_FUNC_RETURN(ctx, 1, r);
@@ -240,7 +240,7 @@ int sc_disconnect_card(sc_card_t *card, int action)
 			      sc_strerror(r));
 	}
 	if (card->reader->ops->disconnect) {
-		int r = card->reader->ops->disconnect(card->reader, card->slot, action);
+		int r = card->reader->ops->disconnect(card->reader, card->slot);
 		if (r)
 			sc_error(card->ctx, "disconnect() failed: %s\n",
 			      sc_strerror(r));
diff --git a/src/libopensc/opensc.h b/src/libopensc/opensc.h
index 0532ed39..386dc4f0 100644
--- a/src/libopensc/opensc.h
+++ b/src/libopensc/opensc.h
@@ -378,8 +378,7 @@ struct sc_reader_operations {
 	int (*detect_card_presence)(struct sc_reader *reader,
 				    struct sc_slot_info *slot);
 	int (*connect)(struct sc_reader *reader, struct sc_slot_info *slot);
-	int (*disconnect)(struct sc_reader *reader, struct sc_slot_info *slot,
-			  int action);
+	int (*disconnect)(struct sc_reader *reader, struct sc_slot_info *slot);
 	int (*transmit)(struct sc_reader *reader, struct sc_slot_info *slot,
 			sc_apdu_t *apdu);
 	int (*lock)(struct sc_reader *reader, struct sc_slot_info *slot);
diff --git a/src/libopensc/reader-ctapi.c b/src/libopensc/reader-ctapi.c
index c208ceb4..82a32336 100644
--- a/src/libopensc/reader-ctapi.c
+++ b/src/libopensc/reader-ctapi.c
@@ -420,8 +420,7 @@ static int ctapi_connect(sc_reader_t *reader, sc_slot_info_t *slot)
 	return 0;
 }
 
-static int ctapi_disconnect(sc_reader_t *reader, sc_slot_info_t *slot,
-			   int action)
+static int ctapi_disconnect(sc_reader_t *reader, sc_slot_info_t *slot)
 {
 	return 0;
 }
diff --git a/src/libopensc/reader-openct.c b/src/libopensc/reader-openct.c
index 17325769..b3ef65fd 100644
--- a/src/libopensc/reader-openct.c
+++ b/src/libopensc/reader-openct.c
@@ -41,7 +41,7 @@ static int openct_reader_detect_card_presence(sc_reader_t *reader,
 static int openct_reader_connect(sc_reader_t *reader,
 			sc_slot_info_t *slot);
 static int openct_reader_disconnect(sc_reader_t *reader,
-			sc_slot_info_t *slot, int action);
+			sc_slot_info_t *slot);
 static int openct_reader_transmit(sc_reader_t *reader,
 			sc_slot_info_t *slot, sc_apdu_t *apdu);
 static int openct_reader_perform_verify(sc_reader_t *reader,
@@ -273,7 +273,7 @@ openct_reader_reconnect(sc_reader_t *reader,
 
 int
 openct_reader_disconnect(sc_reader_t *reader,
-			sc_slot_info_t *slot, int action)
+			sc_slot_info_t *slot)
 {
 	struct driver_data *data = (struct driver_data *) reader->drv_data;
 
diff --git a/src/libopensc/reader-pcsc.c b/src/libopensc/reader-pcsc.c
index 7d5c2ece..de41ba83 100644
--- a/src/libopensc/reader-pcsc.c
+++ b/src/libopensc/reader-pcsc.c
@@ -554,8 +554,7 @@ static int pcsc_connect(sc_reader_t *reader, sc_slot_info_t *slot)
 	return SC_SUCCESS;
 }
 
-static int pcsc_disconnect(sc_reader_t *reader, sc_slot_info_t *slot,
-			   int action)
+static int pcsc_disconnect(sc_reader_t * reader, sc_slot_info_t * slot)
 {
 	struct pcsc_slot_data *pslot = GET_SLOT_DATA(slot);
 	struct pcsc_private_data *priv = GET_PRIV_DATA(reader);