turnkey/openpgp-card
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Break from macro

Browse source
This commit is contained in:
Heiko Schaefer 2022-02-14 15:41:36 +01:00
parent 87788e8912
commit 50d8b89fd2
No known key found for this signature in database
GPG key ID: 4A849A1904CCBD7D
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pcsc/src/lib.rs
View file

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