[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-308-g47e6b6b

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  47e6b6bad1dff493f4102a5549a7bb54466684c2 (commit)
       via  672f4aeba8bf55839911e1fe805af6b2873853f7 (commit)
       via  7901c5c2a3b7b24e9a4eaab590b0a54e9695c3e4 (commit)
      from  62fb86c6589f7f74dad4741db31b3aefa0848420 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 47e6b6bad1dff493f4102a5549a7bb54466684c2
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Feb 10 23:12:28 2014 +0100

    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.

diff --git a/g10/keygen.c b/g10/keygen.c
index b4b32c0..135699d 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*/
 }

commit 672f4aeba8bf55839911e1fe805af6b2873853f7
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Feb 10 20:14:14 2014 +0100

    tests: Avoid segv if dns cert lookup is not configured.
    
    * common/dns-cert.c (get_dns_cert) [!USE_DNS_CERT]: Reset return args.

diff --git a/common/dns-cert.c b/common/dns-cert.c
index dca15b1..7c1b9c6 100644
--- a/common/dns-cert.c
+++ b/common/dns-cert.c
@@ -360,10 +360,10 @@ get_dns_cert (const char *name, estream_t *r_key,
 #endif /*!USE_ADNS */
 #else /* !USE_DNS_CERT */
   (void)name;
-  (void)r_key;
-  (void)r_fpr;
-  (void)r_fprlen;
-  (void)r_url;
+  *r_key = NULL;
+  *r_fpr = NULL;
+  *r_fprlen = 0;
+  *r_url = NULL;
 
   return gpg_err_make (default_errsource, GPG_ERR_NOT_SUPPORTED);
 #endif

commit 7901c5c2a3b7b24e9a4eaab590b0a54e9695c3e4
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Feb 10 19:48:42 2014 +0100

    gpg: Cleanup compiler warnings due to some configure options.
    
    * g10/photoid.c (show_photos) [DISABLE_PHOTO_VIEWER]: Mark args as
    unused.
    * tools/gpgconf-comp.c (my_dgettext): Mark DOMAIN as unused if NLS is
    not configured.

diff --git a/g10/photoid.c b/g10/photoid.c
index 3728cd0..132adca 100644
--- a/g10/photoid.c
+++ b/g10/photoid.c
@@ -287,7 +287,12 @@ void
 show_photos(const struct user_attribute *attrs, int count,
             PKT_public_key *pk, PKT_user_id *uid)
 {
-#ifndef DISABLE_PHOTO_VIEWER
+#ifdef DISABLE_PHOTO_VIEWER
+  (void)attrs;
+  (void)count;
+  (void)pk;
+  (void)uid;
+#else /*!DISABLE_PHOTO_VIEWER*/
   int i;
   struct expando_args args;
   u32 len;
@@ -367,5 +372,5 @@ show_photos(const struct user_attribute *attrs, int count,
 
  fail:
   log_error(_("unable to display photo ID!\n"));
-#endif
+#endif /*!DISABLE_PHOTO_VIEWER*/
 }
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 024417e..dda4c9a 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -1230,8 +1230,11 @@ my_dgettext (const char *domain, const char *msgid)
       return text ? text : msgid;
     }
   else
-#endif
     return msgid;
+#else
+  (void)domain;
+  return msgid;
+#endif
 }
 
 

-----------------------------------------------------------------------

Summary of changes:
 common/dns-cert.c    |    8 ++++----
 g10/keygen.c         |   23 ++++++++++++++++++++++-
 g10/photoid.c        |    9 +++++++--
 tools/gpgconf-comp.c |    5 ++++-
 4 files changed, 37 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org