[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.26-43-g3d9f8bf

[by Joshua Rogers]

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, STABLE-BRANCH-2-0 has been updated
       via  3d9f8bf1dc0c7165a5d2a31568ed425d2dc3b91e (commit)
      from  068ec6c8ed07268469f33e5b3ba1e094d9bf3394 (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 3d9f8bf1dc0c7165a5d2a31568ed425d2dc3b91e
Author: Joshua Rogers <git at internot.info>
Date:   Sat Jan 24 03:03:33 2015 +1100

    Remove incorrect expression leading to errors.
    
    * scd/ccid-driver.c (send_escape_cmd): Fix setting of 'rc'.
    --
    
    Variable 'rc' in send_escape_cmd was overwritten before it was
    returned, leading to incorrect computation.
    
    Signed-off-by: Joshua Rogers <git at internot.info>
    
    [Log entry reformatted - wk]

diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c
index 6e0bc55..c4c0d9c 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -2266,8 +2266,8 @@ send_escape_cmd (ccid_driver_t handle,
             {
               memcpy (result, msg, msglen);
               *resultlen = msglen;
+              rc = 0;
             }
-          rc = 0;
         }
         break;
       default:

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

Summary of changes:
 scd/ccid-driver.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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