From 50d8b89fd20666c1557f1a8c5605709550181556 Mon Sep 17 00:00:00 2001
From: Heiko Schaefer <heiko@schaefer.name>
Date: Mon, 14 Feb 2022 15:41:36 +0100
Subject: [PATCH] Break from macro

---
 pcsc/src/lib.rs | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/pcsc/src/lib.rs b/pcsc/src/lib.rs
index 86f3096..eb9d8ed 100644
--- a/pcsc/src/lib.rs
+++ b/pcsc/src/lib.rs
@@ -54,7 +54,10 @@ macro_rules! transaction {
                         // the caller always expects a card that has not
                         // been "select"ed yet.
                         if $reselect {
-                            TxClient::select(&mut txc)?;
+                            match TxClient::select(&mut txc) {
+                                Ok(_) => {}
+                                Err(err) => break Err(err),
+                            }
                         }
 
                         tx = txc.tx();
@@ -73,17 +76,21 @@ macro_rules! transaction {
                     log::debug!("start_tx: do reconnect");
 
                     {
-                        c.reconnect(
+                        match c.reconnect(
                             mode,
                             Protocols::ANY,
                             Disposition::ResetCard,
-                        )
-                        .map_err(|e| {
-                            Error::Smartcard(SmartcardError::Error(format!(
-                                "Reconnect failed: {:?}",
-                                e
-                            )))
-                        })?;
+                        ) {
+                            Ok(_) => {}
+                            Err(err) => {
+                                break Err(Error::Smartcard(
+                                    SmartcardError::Error(format!(
+                                        "Reconnect failed: {:?}",
+                                        err
+                                    )),
+                                ))
+                            }
+                        }
                     }
 
                     log::debug!("start_tx: reconnected.");