[git] GnuPG - branch, master, updated. gnupg-2.1.18-82-g7a666cc

[by NIIBE Yutaka]

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  7a666ccb44f43c4efbaa51c1ca16fc0b37c3399d (commit)
      from  a3509e12b6626a585ce7da6ceed8cfddcba2460f (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 7a666ccb44f43c4efbaa51c1ca16fc0b37c3399d
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Feb 16 11:49:37 2017 +0900

    scd: Minor fixes to silence compiler warnings.
    
    * scd/app.c (app_reset): Initialize ERR.
    * scd/scdaemon.c (scd_kick_the_loop, handle_connections): Catch the
    return value.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/scd/app.c b/scd/app.c
index 29c9dad..b6f3a05 100644
--- a/scd/app.c
+++ b/scd/app.c
@@ -139,7 +139,7 @@ check_application_conflict (const char *name, app_t app)
 gpg_error_t
 app_reset (app_t app, ctrl_t ctrl, int send_reset)
 {
-  gpg_error_t err;
+  gpg_error_t err = 0;
 
   if (send_reset)
     {
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index e4b0ef8..f7e9f83 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -1182,8 +1182,11 @@ start_connection_thread (void *arg)
 void
 scd_kick_the_loop (void)
 {
+  int ret;
+
   /* Kick the select loop.  */
-  write (notify_fd, "", 1);
+  ret = write (notify_fd, "", 1);
+  (void)ret;
 }
 
 /* Connection handler loop.  Wait for connection requests and spawn a
@@ -1308,8 +1311,7 @@ handle_connections (int listen_fd)
         {
           char buf[256];
 
-          read (pipe_fd[0], buf, sizeof buf);
-          ret--;
+          ret = read (pipe_fd[0], buf, sizeof buf);
         }
 
       if (listen_fd != -1 && FD_ISSET (listen_fd, &read_fdset))

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

Summary of changes:
 scd/app.c      | 2 +-
 scd/scdaemon.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)


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