From f432caf72cb81a03f85faea8b37e370643cbaaff Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Tue, 22 Nov 2016 09:36:43 +0100 Subject: [PATCH] coolkey: Improve return values logging in init_ex() function --- src/libopensc/pkcs15-coolkey.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/libopensc/pkcs15-coolkey.c b/src/libopensc/pkcs15-coolkey.c index d935df63..487be198 100644 --- a/src/libopensc/pkcs15-coolkey.c +++ b/src/libopensc/pkcs15-coolkey.c @@ -680,17 +680,20 @@ int sc_pkcs15emu_coolkey_init_ex(sc_pkcs15_card_t *p15card, struct sc_aid *aid, sc_pkcs15emu_opt_t *opts) { - sc_card_t *card = p15card->card; + sc_card_t *card = p15card->card; sc_context_t *ctx = card->ctx; + int rv; LOG_FUNC_CALLED(ctx); if (opts && opts->flags & SC_PKCS15EMU_FLAGS_NO_CHECK) - return sc_pkcs15emu_coolkey_init(p15card); + rv = sc_pkcs15emu_coolkey_init(p15card); else { - int r = coolkey_detect_card(p15card); - if (r) - return SC_ERROR_WRONG_CARD; - return sc_pkcs15emu_coolkey_init(p15card); + rv = coolkey_detect_card(p15card); + if (rv) + LOG_FUNC_RETURN(ctx, SC_ERROR_WRONG_CARD); + rv = sc_pkcs15emu_coolkey_init(p15card); } + + LOG_FUNC_RETURN(ctx, rv); }