[Pkg-gnupg-commit] [gnupg2] 143/160: gpg: Do not print a the short keyid if the high word is zero.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch upstream
in repository gnupg2.

commit 7b96a8d736934e65bb2adbc17059f84dfeaf95fb
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jul 13 17:19:56 2016 +0200

    gpg: Do not print a the short keyid if the high word is zero.
    
    * g10/keyid.c (format_keyid): Always returh long keyid ifor KF_LONG.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 g10/keyid.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/g10/keyid.c b/g10/keyid.c
index e67f67f..84990a3 100644
--- a/g10/keyid.c
+++ b/g10/keyid.c
@@ -347,11 +347,7 @@ format_keyid (u32 *keyid, int format, char *buffer, int len)
       break;
 
     case KF_LONG:
-      if (keyid[0])
-	snprintf (buffer, len, "%08lX%08lX",
-                  (ulong)keyid[0], (ulong)keyid[1]);
-      else
-	snprintf (buffer, len, "%08lX", (ulong)keyid[1]);
+      snprintf (buffer, len, "%08lX%08lX", (ulong)keyid[0], (ulong)keyid[1]);
       break;
 
     case KF_0xSHORT:
@@ -359,11 +355,7 @@ format_keyid (u32 *keyid, int format, char *buffer, int len)
       break;
 
     case KF_0xLONG:
-      if(keyid[0])
-	snprintf (buffer, len, "0x%08lX%08lX",
-                  (ulong)keyid[0],(ulong)keyid[1]);
-      else
-	snprintf (buffer, len, "0x%08lX", (ulong)keyid[1]);
+      snprintf (buffer, len, "0x%08lX%08lX", (ulong)keyid[0],(ulong)keyid[1]);
       break;
 
     default:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git