On Tue, 2018-08-21 at 17:07 +0200, Christophe Fergeau wrote:
> gp_card_init() has a prototype similar to cac_card_init() but does
> not
> use most of its parameters. This commit removes these.
Thank you for tracking down these issues. The patch set looks good to
me. Ack.
> Signed-off-by: Christophe Fergeau <cfergeau@xxxxxxxxxx>
> ---
> src/gp.c | 7 +------
> src/gp.h | 5 +----
> src/vcard_emul_type.c | 5 ++---
> 3 files changed, 4 insertions(+), 13 deletions(-)
>
> diff --git a/src/gp.c b/src/gp.c
> index a4233cc..0150b3c 100644
> --- a/src/gp.c
> +++ b/src/gp.c
> @@ -75,12 +75,7 @@ gp_applet_container_process_apdu(VCard *card,
> VCardAPDU *apdu,
> * the rest are connected through function pointers.
> */
> VCardStatus
> -gp_card_init(VReader *reader, VCard *card,
> - const char *params,
> - unsigned char * const *cert,
> - int cert_len[],
> - VCardKey *key[] /* adopt the keys*/,
> - int cert_count)
> +gp_card_init(VReader *reader, VCard *card)
> {
> VCardApplet *applet;
>
> diff --git a/src/gp.h b/src/gp.h
> index 7f68e47..01d4042 100644
> --- a/src/gp.h
> +++ b/src/gp.h
> @@ -22,9 +22,6 @@
> * this file. All the rest are connected through function pointers.
> */
> VCardStatus
> -gp_card_init(VReader *reader, VCard *card, const char *params,
> - unsigned char * const *cert, int cert_len[],
> - VCardKey *key[] /* adopt the keys*/, int cert_count);
> -
> +gp_card_init(VReader *reader, VCard *card);
>
> #endif
> diff --git a/src/vcard_emul_type.c b/src/vcard_emul_type.c
> index d818fe7..a24e503 100644
> --- a/src/vcard_emul_type.c
> +++ b/src/vcard_emul_type.c
> @@ -30,9 +30,8 @@ VCardStatus vcard_init(VReader *vreader, VCard
> *vcard,
> rv = cac_card_init(vreader, vcard, params,
> cert, cert_len, key, cert_count);
> if (rv == VCARD_DONE)
> - rv = gp_card_init(vreader, vcard, params,
> - cert, cert_len, key, cert_count);
> - return rv;
> + rv = gp_card_init(vreader, vcard);
> + return rv;
> /* add new ones here */
> case VCARD_EMUL_PASSTHRU:
> default:
--
Jakub Jelen
Software Engineer
Security Technologies
Red Hat, Inc.
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel