[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-238-g04e2c83

[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  04e2c83f189cc56342e1be784bdc63761ccdb5bb (commit)
      from  b6d54f1196d5f110fd94dfd661e74dbc60ca9811 (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 04e2c83f189cc56342e1be784bdc63761ccdb5bb
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Aug 22 09:35:21 2013 +0200

    agent: Fix two compiler warnings.
    
    * agent/command.c (cmd_preset_passphrase, pinentry_loopback): Use %zu
    in format string.
    * scd/ccid-driver.c (ccid_get_atr): Ditto.
    * agent/command-ssh.c (stream_read_string): Init arg STRING_SIZE to
    avoid maybe_unitialized warning.
    --
    
    Actually the first one might have been a problem on big endian
    machines.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index f378ade..0ff70b5 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -487,6 +487,8 @@ stream_read_string (estream_t stream, unsigned int secure,
   unsigned char *buffer = NULL;
   u32 length = 0;
 
+  *string_size = 0;
+
   /* Read string length.  */
   err = stream_read_uint32 (stream, &length);
   if (err)
diff --git a/agent/command.c b/agent/command.c
index 5e955ab..8e5d180 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -1809,7 +1809,7 @@ cmd_preset_passphrase (assuan_context_t ctx, char *line)
        * limit is 480 characters. */
       size_t maxlen = 480;
 
-      rc = print_assuan_status (ctx, "INQUIRE_MAXLEN", "%u", maxlen);
+      rc = print_assuan_status (ctx, "INQUIRE_MAXLEN", "%zu", maxlen);
       if (!rc)
 	rc = assuan_inquire (ctx, "PASSPHRASE", &passphrase, &len, maxlen);
     }
@@ -3038,7 +3038,7 @@ pinentry_loopback(ctrl_t ctrl, const char *keyword,
   gpg_error_t rc;
   assuan_context_t ctx = ctrl->server_local->assuan_ctx;
 
-  rc = print_assuan_status (ctx, "INQUIRE_MAXLEN", "%u", max_length);
+  rc = print_assuan_status (ctx, "INQUIRE_MAXLEN", "%zu", max_length);
   if (rc)
     return rc;
 
diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c
index 3376be0..478d8c6 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -2673,7 +2673,7 @@ ccid_get_atr (ccid_driver_t handle,
 
       if (msglen != 10 + 4)
         {
-          DEBUGOUT_1 ("Setting PPS failed: %d\n", msglen);
+          DEBUGOUT_1 ("Setting PPS failed: %zu\n", msglen);
           return CCID_DRIVER_ERR_CARD_IO_ERROR;
         }
 

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

Summary of changes:
 agent/command-ssh.c |    2 ++
 agent/command.c     |    4 ++--
 scd/ccid-driver.c   |    2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)


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