1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00

* g10.c (parse_list_options): Fix non-constant initializer so we can build

with C89.
This commit is contained in:
David Shaw 2004-10-21 01:10:49 +00:00
parent 27d06166d3
commit 107e515aa9
2 changed files with 11 additions and 11 deletions

View File

@ -1,16 +1,11 @@
2004-10-20 Werner Koch <wk@g10code.com> 2004-10-20 David Shaw <dshaw@jabberwocky.com>
* apdu.c (apdu_open_reader): Load pcsc_get_status_change fucntion. * g10.c (parse_list_options): Fix non-constant initializer so we
(pcsc_get_status): Implemented. can build with C89.
(reset_pcsc_reader): Implemented.
(open_pcsc_reader): Succeed even with no card inserted.
(open_ccid_reader): Set LAST_STATUS.
* iso7816.c (iso7816_select_application): Always use 0 for P1. 2004-10-17 David Shaw <dshaw@jabberwocky.com>
2004-10-18 Werner Koch <wk@g10code.com> * keylist.c (print_one_subpacket): The flags field should be hex.
* ccid-driver.c (ccid_get_atr): Reset T=1 state info.
2004-10-17 Werner Koch <wk@g10code.com> 2004-10-17 Werner Koch <wk@g10code.com>

View File

@ -1463,10 +1463,15 @@ parse_list_options(char *str)
{"show-unusable-subkeys",LIST_SHOW_UNUSABLE_SUBKEYS,NULL}, {"show-unusable-subkeys",LIST_SHOW_UNUSABLE_SUBKEYS,NULL},
{"show-keyring",LIST_SHOW_KEYRING,NULL}, {"show-keyring",LIST_SHOW_KEYRING,NULL},
{"show-sig-expire",LIST_SHOW_SIG_EXPIRE,NULL}, {"show-sig-expire",LIST_SHOW_SIG_EXPIRE,NULL},
{"show-sig-subpackets",LIST_SHOW_SIG_SUBPACKETS,&subpackets}, {"show-sig-subpackets",LIST_SHOW_SIG_SUBPACKETS,NULL},
{NULL,0,NULL} {NULL,0,NULL}
}; };
/* C99 allows for non-constant initializers, but we'd like to
compile everywhere, so fill in the show-sig-subpackets argument
here. */
lopts[12].value=&subpackets;
if(parse_options(str,&opt.list_options,lopts,1)) if(parse_options(str,&opt.list_options,lopts,1))
{ {
if(opt.list_options&LIST_SHOW_SIG_SUBPACKETS) if(opt.list_options&LIST_SHOW_SIG_SUBPACKETS)