[Spice-devel] [PATCH 1/4 v2] mingw: remove cac_is_cac_card dead code

Fabiano FidĂȘncio fidencio at redhat.com
Thu Oct 8 08:23:25 PDT 2015


Without removing cac_is_cac_card the following error can be faced:

Cannot export cac_is_cac_card: symbol not defined
collect2: error: ld returned 1 exit status

Found a not so old QEMU thread about this:
https://www.mail-archive.com/qemu-devel%40nongnu.org/msg291698.html
--
Changes since v1:
- Remove the cac_is_cac_card deadcode with the symbol from the .syms
---
 src/cac.h             | 3 ---
 src/libcacard.syms    | 1 -
 src/vcard_emul_type.c | 6 ------
 3 files changed, 10 deletions(-)

diff --git a/src/cac.h b/src/cac.h
index fa94644..a91b88f 100644
--- a/src/cac.h
+++ b/src/cac.h
@@ -25,7 +25,4 @@ VCardStatus cac_card_init(VReader *reader, VCard *card, const char *params,
               unsigned char * const *cert, int cert_len[],
               VCardKey *key[] /* adopt the keys*/,
               int cert_count);
-
-/* not yet implemented */
-VCardStatus cac_is_cac_card(VReader *reader);
 #endif
diff --git a/src/libcacard.syms b/src/libcacard.syms
index 1697515..2f9d423 100644
--- a/src/libcacard.syms
+++ b/src/libcacard.syms
@@ -1,5 +1,4 @@
 cac_card_init
-cac_is_cac_card
 vcard_add_applet
 vcard_apdu_delete
 vcard_apdu_new
diff --git a/src/vcard_emul_type.c b/src/vcard_emul_type.c
index 42afbab..04e8d99 100644
--- a/src/vcard_emul_type.c
+++ b/src/vcard_emul_type.c
@@ -36,12 +36,6 @@ VCardStatus vcard_init(VReader *vreader, VCard *vcard,
 
 VCardEmulType vcard_emul_type_select(VReader *vreader)
 {
-#ifdef notdef
-    /* since there is only one emulator no need to call this function */
-    if (cac_is_cac_card(vreader) == VCARD_DONE) {
-        return VCARD_EMUL_CAC;
-    }
-#endif
     /* return the default */
     return VCARD_EMUL_CAC;
 }
-- 
2.4.3



More information about the Spice-devel mailing list