diff options
| author | Werner Koch <[email protected]> | 2016-07-14 13:58:56 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-07-14 13:58:56 +0000 |
| commit | be1e4560d5afb99a6a7b7c639cce980006530a9e (patch) | |
| tree | 0ba98e2dbc56153cb5f6e1c50b2adc259965a40e /g10/keyid.c | |
| parent | Merge branch 'master' into STABLE-BRANCH-2-2 (diff) | |
| parent | po: Auto-update translations (diff) | |
| download | gnupg-be1e4560d5afb99a6a7b7c639cce980006530a9e.tar.gz gnupg-be1e4560d5afb99a6a7b7c639cce980006530a9e.zip | |
Merge branch 'master' into STABLE-BRANCH-2-2
Diffstat (limited to '')
| -rw-r--r-- | g10/keyid.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/g10/keyid.c b/g10/keyid.c index e67f67f65..84990a30d 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: |