diff options
| author | David Shaw <[email protected]> | 2004-12-15 05:16:53 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-12-15 05:16:53 +0000 |
| commit | 7a388529a3185f96f3af98072f345f266eb37870 (patch) | |
| tree | f93e3914104811680aa8e0e09b95e21bb05233c0 /g10/apdu.c | |
| parent | * keyedit.c (keyedit_menu): Re-remove the N_() markers. (diff) | |
| download | gnupg-7a388529a3185f96f3af98072f345f266eb37870.tar.gz gnupg-7a388529a3185f96f3af98072f345f266eb37870.zip | |
* apdu.c (apdu_send_le, apdu_send_direct), keylist.c
(status_one_subpacket, print_one_subpacket): Fix some compiler warnings.
* g10.c (main): Fix --compression-algo to take a string argument like
--compress-algo.
* trustdb.c (uid_trust_string_fixed): For safety, check for a pk.
Diffstat (limited to '')
| -rw-r--r-- | g10/apdu.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/g10/apdu.c b/g10/apdu.c index c75efd122..1f7194c17 100644 --- a/g10/apdu.c +++ b/g10/apdu.c @@ -2717,7 +2717,8 @@ apdu_send_le(int slot, int class, int ins, int p0, int p1, resultlen -= 2; if (DBG_CARD_IO) { - log_debug (" response: sw=%04X datalen=%d\n", sw, resultlen); + log_debug (" response: sw=%04X datalen=%u\n", + sw, (unsigned int)resultlen); if ( !retbuf && (sw == SW_SUCCESS || (sw & 0xff00) == SW_MORE_DATA)) log_printhex (" dump: ", result, resultlen); } @@ -2783,7 +2784,8 @@ apdu_send_le(int slot, int class, int ins, int p0, int p1, resultlen -= 2; if (DBG_CARD_IO) { - log_debug (" more: sw=%04X datalen=%d\n", sw, resultlen); + log_debug (" more: sw=%04X datalen=%u\n", + sw, (unsigned int)resultlen); if (!retbuf && (sw==SW_SUCCESS || (sw&0xff00)==SW_MORE_DATA)) log_printhex (" dump: ", result, resultlen); } @@ -2916,7 +2918,8 @@ apdu_send_direct (int slot, const unsigned char *apdudata, size_t apdudatalen, resultlen -= 2; if (DBG_CARD_IO) { - log_debug (" response: sw=%04X datalen=%d\n", sw, resultlen); + log_debug (" response: sw=%04X datalen=%u\n", + sw, (unsigned int)resultlen); if ( !retbuf && (sw == SW_SUCCESS || (sw & 0xff00) == SW_MORE_DATA)) log_printhex (" dump: ", result, resultlen); } @@ -2968,7 +2971,8 @@ apdu_send_direct (int slot, const unsigned char *apdudata, size_t apdudatalen, resultlen -= 2; if (DBG_CARD_IO) { - log_debug (" more: sw=%04X datalen=%d\n", sw, resultlen); + log_debug (" more: sw=%04X datalen=%u\n", + sw, (unsigned int)resultlen); if (!retbuf && (sw==SW_SUCCESS || (sw&0xff00)==SW_MORE_DATA)) log_printhex (" dump: ", result, resultlen); } |