diff options
| author | Werner Koch <[email protected]> | 2014-02-10 22:12:28 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2014-02-10 22:15:34 +0000 |
| commit | 47e6b6bad1dff493f4102a5549a7bb54466684c2 (patch) | |
| tree | 640100c39402f2326c9ff81a098d012e6ed9a476 | |
| parent | tests: Avoid segv if dns cert lookup is not configured. (diff) | |
| download | gnupg-47e6b6bad1dff493f4102a5549a7bb54466684c2.tar.gz gnupg-47e6b6bad1dff493f4102a5549a7bb54466684c2.zip | |
gpg: Silent more compiler warnings due to some configure options.
* g10/keygen.c (generate_keypair, gen_card_key)
(gen_card_key_with_backup) [!ENABLE_CARD_SUPPORT]: Mark unused args.
Diffstat (limited to '')
| -rw-r--r-- | g10/keygen.c | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/g10/keygen.c b/g10/keygen.c index b4b32c048..135699db3 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -3377,6 +3377,10 @@ generate_keypair (ctrl_t ctrl, const char *fname, const char *card_serialno, struct para_data_s *r; struct output_control_s outctrl; +#ifndef ENABLE_CARD_SUPPORT + (void)card_backup_key; +#endif + memset( &outctrl, 0, sizeof( outctrl ) ); if (opt.batch && card_serialno) @@ -4265,6 +4269,12 @@ gen_card_key (int algo, int keyno, int is_primary, kbnode_t pub_root, return 0; #else + (void)algo; + (void)keyno; + (void)is_primary; + (void)pub_root; + (void)timestamp; + (void)expireval; return gpg_error (GPG_ERR_NOT_SUPPORTED); #endif /*!ENABLE_CARD_SUPPORT*/ } @@ -4276,7 +4286,8 @@ gen_card_key_with_backup (int algo, int keyno, int is_primary, KBNODE pub_root, u32 timestamp, u32 expireval, struct para_data_s *para) { -#if 0 /* FIXME: Move this to gpg-agent. */ +#if ENABLE_CARD_SUPPORT && 0 + /* FIXME: Move this to gpg-agent. */ int rc; const char *s; PACKET *pkt; @@ -4433,6 +4444,16 @@ gen_card_key_with_backup (int algo, int keyno, int is_primary, return 0; #else +# if __GCC__ && ENABLE_CARD_SUPPORT +# warning Card support still missing +# endif + (void)algo; + (void)keyno; + (void)is_primary; + (void)pub_root; + (void)timestamp; + (void)expireval; + (void)para; return gpg_error (GPG_ERR_NOT_SUPPORTED); #endif /*!ENABLE_CARD_SUPPORT*/ } |