diff options
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 11 | ||||
| -rw-r--r-- | g10/apdu.c | 30 | ||||
| -rw-r--r-- | g10/app-openpgp.c | 2 | ||||
| -rw-r--r-- | g10/cardglue.c | 2 | ||||
| -rw-r--r-- | g10/misc.c | 2 | ||||
| -rw-r--r-- | g10/options.h | 2 |
6 files changed, 31 insertions, 18 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 5932bba46..2aa8b6dbf 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,14 @@ +2005-03-30 Werner Koch <[email protected]> + + * cardglue.c (pin_cb): Print a warning if the info string hack is + not there. This may happen due to typos in the translation. + +2005-03-22 Werner Koch <[email protected]> + + * misc.c (w32_shgetfolderpath) [W32]: Changed declaration of + function ptr. Noted by Tim Costello. + * apdu.c [W32]: Changed declaration of dlopened function pointers. + 2005-03-21 David Shaw <[email protected]> * gpgv.c: Stubs for tty_enable_completion() & diff --git a/g10/apdu.c b/g10/apdu.c index 040de1461..53d8b06b4 100644 --- a/g10/apdu.c +++ b/g10/apdu.c @@ -150,12 +150,12 @@ static struct reader_table_s reader_table[MAX_READER]; /* ct API function pointer. */ -static char (* DLSTDCALL CT_init) (unsigned short ctn, unsigned short Pn); -static char (* DLSTDCALL CT_data) (unsigned short ctn, unsigned char *dad, +static char (DLSTDCALL * CT_init) (unsigned short ctn, unsigned short Pn); +static char (DLSTDCALL * CT_data) (unsigned short ctn, unsigned char *dad, unsigned char *sad, unsigned short lc, unsigned char *cmd, unsigned short *lr, unsigned char *rsp); -static char (* DLSTDCALL CT_close) (unsigned short ctn); +static char (DLSTDCALL * CT_close) (unsigned short ctn); /* PC/SC constants and function pointer. */ #define PCSC_SCOPE_USER 0 @@ -217,46 +217,46 @@ struct pcsc_readerstate_s typedef struct pcsc_readerstate_s *pcsc_readerstate_t; -long (* DLSTDCALL pcsc_establish_context) (unsigned long scope, +long (DLSTDCALL * pcsc_establish_context) (unsigned long scope, const void *reserved1, const void *reserved2, unsigned long *r_context); -long (* DLSTDCALL pcsc_release_context) (unsigned long context); -long (* DLSTDCALL pcsc_list_readers) (unsigned long context, +long (DLSTDCALL * pcsc_release_context) (unsigned long context); +long (DLSTDCALL * pcsc_list_readers) (unsigned long context, const char *groups, char *readers, unsigned long*readerslen); -long (* DLSTDCALL pcsc_get_status_change) (unsigned long context, +long (DLSTDCALL * pcsc_get_status_change) (unsigned long context, unsigned long timeout, pcsc_readerstate_t readerstates, unsigned long nreaderstates); -long (* DLSTDCALL pcsc_connect) (unsigned long context, +long (DLSTDCALL * pcsc_connect) (unsigned long context, const char *reader, unsigned long share_mode, unsigned long preferred_protocols, unsigned long *r_card, unsigned long *r_active_protocol); -long (* DLSTDCALL pcsc_reconnect) (unsigned long card, +long (DLSTDCALL * pcsc_reconnect) (unsigned long card, unsigned long share_mode, unsigned long preferred_protocols, unsigned long initialization, unsigned long *r_active_protocol); -long (* DLSTDCALL pcsc_disconnect) (unsigned long card, +long (DLSTDCALL * pcsc_disconnect) (unsigned long card, unsigned long disposition); -long (* DLSTDCALL pcsc_status) (unsigned long card, +long (DLSTDCALL * pcsc_status) (unsigned long card, char *reader, unsigned long *readerlen, unsigned long *r_state, unsigned long *r_protocol, unsigned char *atr, unsigned long *atrlen); -long (* DLSTDCALL pcsc_begin_transaction) (unsigned long card); -long (* DLSTDCALL pcsc_end_transaction) (unsigned long card); -long (* DLSTDCALL pcsc_transmit) (unsigned long card, +long (DLSTDCALL * pcsc_begin_transaction) (unsigned long card); +long (DLSTDCALL * pcsc_end_transaction) (unsigned long card); +long (DLSTDCALL * pcsc_transmit) (unsigned long card, const pcsc_io_request_t send_pci, const unsigned char *send_buffer, unsigned long send_len, pcsc_io_request_t recv_pci, unsigned char *recv_buffer, unsigned long *recv_len); -long (* DLSTDCALL pcsc_set_timeout) (unsigned long context, +long (DLSTDCALL * pcsc_set_timeout) (unsigned long context, unsigned long timeout); diff --git a/g10/app-openpgp.c b/g10/app-openpgp.c index fca0a98b7..5948edde5 100644 --- a/g10/app-openpgp.c +++ b/g10/app-openpgp.c @@ -1012,7 +1012,7 @@ do_change_pin (app_t app, ctrl_t ctrl, const char *chvnostr, int reset_mode, else app->did_chv1 = app->did_chv2 = 0; - /* Note to translators: Do not translate the "|*|" prefixes but + /* TRANSLATORS: Do not translate the "|*|" prefixes but keep it at the start of the string. We need this elsewhere to get some infos on the string. */ rc = pincb (pincb_arg, chvno == 3? _("|AN|New Admin PIN") : _("|N|New PIN"), diff --git a/g10/cardglue.c b/g10/cardglue.c index 9e5a14f8c..530e8a43f 100644 --- a/g10/cardglue.c +++ b/g10/cardglue.c @@ -674,6 +674,8 @@ pin_cb (void *opaque, const char *info, char **retstr) } info = ends+1; } + else + log_debug ("pin_cb called without proper PIN info hack\n"); again: if (is_status_enabled()) diff --git a/g10/misc.c b/g10/misc.c index 9334dae21..a47839248 100644 --- a/g10/misc.c +++ b/g10/misc.c @@ -1027,7 +1027,7 @@ static HRESULT w32_shgetfolderpath (HWND a, int b, HANDLE c, DWORD d, LPSTR e) { static int initialized; - static HRESULT (* WINAPI func)(HWND,int,HANDLE,DWORD,LPSTR); + static HRESULT (WINAPI * func)(HWND,int,HANDLE,DWORD,LPSTR); if (!initialized) { diff --git a/g10/options.h b/g10/options.h index e3713fc8b..67ccd9d62 100644 --- a/g10/options.h +++ b/g10/options.h @@ -223,7 +223,7 @@ struct { #define DBG_TRUST_VALUE 256 /* debug the trustdb */ #define DBG_HASHING_VALUE 512 /* debug hashing operations */ #define DBG_EXTPROG_VALUE 1024 /* debug external program calls */ -#define DBG_CARD_IO_VALUE 2048 +#define DBG_CARD_IO_VALUE 2048 /* debug smart card I/O. */ #define DBG_PACKET (opt.debug & DBG_PACKET_VALUE) #define DBG_FILTER (opt.debug & DBG_FILTER_VALUE) |