[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-129-g1999446

[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  19994466449a93704d38d429ca1ea36f63da0bf0 (commit)
      from  60c58766aeb847b769372fa981f79abac6014500 (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 19994466449a93704d38d429ca1ea36f63da0bf0
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri Jan 25 14:17:29 2013 +0900

    agent: Fix a bug of handling return code from npth_join.
    
    * agent/call-pinentry.c (agent_popup_message_stop): Fix npth_join
    return code.
    --
    pth_join returns TRUE (1) on success.  But npth_join (and pthread_join)
    returns 0 on success, returns error number on error.

diff --git a/agent/call-pinentry.c b/agent/call-pinentry.c
index c37831a..c6b6b52 100644
--- a/agent/call-pinentry.c
+++ b/agent/call-pinentry.c
@@ -1266,9 +1266,9 @@ agent_popup_message_stop (ctrl_t ctrl)
 
   /* Now wait for the thread to terminate. */
   rc = npth_join (popup_tid, NULL);
-  if (!rc)
+  if (rc)
     log_debug ("agent_popup_message_stop: pth_join failed: %s\n",
-               strerror (errno));
+               strerror (rc));
   /* Thread IDs are opaque, but we try our best here by resetting it
      to the same content that a static global variable has.  */
   memset (&popup_tid, '\0', sizeof (popup_tid));

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

Summary of changes:
 agent/call-pinentry.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


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