OpenPGP: use LOG_FUNC_CALLED & LOG_FUNC_RETURN symmetrically
To help debugging, - replace plain return's after LOG_FUNC_CALLED() has been called with LOG_FUNC_RETURN() - use LOG_FUNC_CALLED() & LOG_FUNC_RETURN() pairs more often
This commit is contained in:
parent
fcecd1bdd2
commit
15125b03ab
|
@ -382,6 +382,8 @@ pgp_match_card(sc_card_t *card)
|
|||
{
|
||||
int i;
|
||||
|
||||
LOG_FUNC_CALLED(card->ctx);
|
||||
|
||||
i = _sc_match_atr(card, pgp_atrs, &card->type);
|
||||
if (i >= 0) {
|
||||
card->name = pgp_atrs[i].name;
|
||||
|
@ -421,10 +423,10 @@ pgp_match_card(sc_card_t *card)
|
|||
snprintf(card_name, sizeof(card_name), "OpenPGP card V%u.%u", major, minor);
|
||||
}
|
||||
sc_file_free(file);
|
||||
return 1;
|
||||
LOG_FUNC_RETURN(card->ctx, 1);
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
LOG_FUNC_RETURN(card->ctx, 0);
|
||||
}
|
||||
|
||||
|
||||
|
@ -447,7 +449,7 @@ pgp_init(sc_card_t *card)
|
|||
|
||||
priv = calloc (1, sizeof *priv);
|
||||
if (!priv)
|
||||
return SC_ERROR_OUT_OF_MEMORY;
|
||||
LOG_FUNC_RETURN(card->ctx, SC_ERROR_OUT_OF_MEMORY);
|
||||
card->drv_data = priv;
|
||||
|
||||
card->cla = 0x00;
|
||||
|
@ -471,7 +473,7 @@ pgp_init(sc_card_t *card)
|
|||
r = get_full_pgp_aid(card, file);
|
||||
if (r < 0) {
|
||||
pgp_finish(card);
|
||||
return SC_ERROR_INVALID_CARD;
|
||||
LOG_FUNC_RETURN(card->ctx, SC_ERROR_INVALID_CARD);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue