diff options
| author | Werner Koch <wk@gnupg.org> | 2016-05-04 11:04:43 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2016-05-04 11:05:13 +0200 |
| commit | d00625dae60f26617d2e1bd4f22c6b35a4e92c91 (patch) | |
| tree | ffc9b4f3a1ced708523658675e1f19a318e8fb17 /g10 | |
| parent | build: Update config.{guess,sub} to 2016-04-02 and 2016-03-30. (diff) | |
| download | gnupg2-d00625dae60f26617d2e1bd4f22c6b35a4e92c91.tar.xz gnupg2-d00625dae60f26617d2e1bd4f22c6b35a4e92c91.zip | |
Some minor string changes and fixed a printf format.
* g10/build-packet.c (notation_value_to_human_readable_string): Use
%zu for size_t.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/build-packet.c | 2 | ||||
| -rw-r--r-- | g10/keyedit.c | 21 |
2 files changed, 15 insertions, 8 deletions
diff --git a/g10/build-packet.c b/g10/build-packet.c index 4d6d4afbb..9b6496766 100644 --- a/g10/build-packet.c +++ b/g10/build-packet.c @@ -1088,7 +1088,7 @@ notation_value_to_human_readable_string (struct notation *notation) preview[i] = '?'; preview[i] = 0; - return xasprintf (_("[ not human readable (%zd bytes: %s%s) ]"), + return xasprintf (_("[ not human readable (%zu bytes: %s%s) ]"), len, preview, i < len ? "..." : ""); } else diff --git a/g10/keyedit.c b/g10/keyedit.c index 3fa3a2c8a..546186495 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -449,8 +449,10 @@ check_all_keysigs (KBNODE kb, int only_selected, int only_selfsigs) { PKT_signature *sig = sigs[i]->pkt->pkt.signature; - log_debug ("Signature appears multiple times, deleting duplicate:\n"); - log_debug (" sig: class 0x%x, issuer: %s, timestamp: %s (%lld), digest: %02x %02x\n", + log_debug ("Signature appears multiple times, " + "deleting duplicate:\n"); + log_debug (" sig: class 0x%x, issuer: %s," + " timestamp: %s (%lld), digest: %02x %02x\n", sig->sig_class, keystr (sig->keyid), isotimestamp (sig->timestamp), (long long) sig->timestamp, @@ -606,7 +608,8 @@ check_all_keysigs (KBNODE kb, int only_selected, int only_selfsigs) { if (DBG_PACKET && pending_desc) log_debug ("%s", pending_desc); - tty_printf (_("can't check signature with unsupported public-key algorithm (%d): %s.\n"), + tty_printf (_("can't check signature with unsupported" + " public-key algorithm (%d): %s.\n"), sig->pubkey_algo, gpg_strerror (err)); break; } @@ -614,7 +617,8 @@ check_all_keysigs (KBNODE kb, int only_selected, int only_selfsigs) { if (DBG_PACKET && pending_desc) log_debug ("%s", pending_desc); - tty_printf (_("can't check signature with unsupported message-digest algorithm %d: %s.\n"), + tty_printf (_("can't check signature with unsupported" + " message-digest algorithm %d: %s.\n"), sig->digest_algo, gpg_strerror (err)); break; } @@ -664,7 +668,8 @@ check_all_keysigs (KBNODE kb, int only_selected, int only_selfsigs) if (DBG_PACKET) { log_debug ("%s", pending_desc); - log_debug (" Good signature out of order! (Over %s (%d) '%s')\n", + log_debug (" Good signature out of order!" + " (Over %s (%d) '%s')\n", n2->pkt->pkttype == PKT_USER_ID ? "user id" : n2->pkt->pkttype == PKT_PUBLIC_SUBKEY @@ -906,7 +911,8 @@ check_all_keysigs (KBNODE kb, int only_selected, int only_selfsigs) reordered), reordered); if (only_selfsigs && (bad_signature || reordered)) - tty_printf (_("Warning: errors found and only checked self-signatures, run 'check' to check all signatures.\n")); + tty_printf (_("Warning: errors found and only checked self-signatures," + " run '%s' to check all signatures.\n"), "check"); return modified; } @@ -989,7 +995,8 @@ trustsig_prompt (byte * trust_value, byte * trust_depth, char **regexp) tty_printf ("\n"); tty_printf (_("Please enter the depth of this trust signature.\n" - "A depth greater than 1 allows the key you are signing to make\n" + "A depth greater than 1 allows the key you are" + " signing to make\n" "trust signatures on your behalf.\n")); tty_printf ("\n"); |