security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-01 16:33:02 +01:00
Code Activity

Some minor string changes and fixed a printf format.

Browse Source 
* g10/build-packet.c (notation_value_to_human_readable_string): Use
%zu for size_t.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-05-04 11:04:43 +02:00
parent 04cc7c3786
commit d00625dae6
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/simple-pwquery.c
View File

@ -694,7 +694,7 @@ simple_query (const char *query)
else else
{ {
#ifdef SPWQ_USE_LOGGING #ifdef SPWQ_USE_LOGGING
log_error (_("problem with the agent (unexpected response \"%s\"\n"), log_error (_("problem with the agent (unexpected response \"%s\")\n"),
response); response);
#endif #endif
rc = SPWQ_ERR_RESPONSE; rc = SPWQ_ERR_RESPONSE;

2
g10/build-packet.c
View File

@ -1088,7 +1088,7 @@ notation_value_to_human_readable_string (struct notation *notation)
preview[i] = '?'; preview[i] = '?';
preview[i] = 0; 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 ? "..." : ""); len, preview, i < len ? "..." : "");
} }
else else

21
g10/keyedit.c
View File

@ -449,8 +449,10 @@ check_all_keysigs (KBNODE kb, int only_selected, int only_selfsigs)
{ {
PKT_signature *sig = sigs[i]->pkt->pkt.signature; PKT_signature *sig = sigs[i]->pkt->pkt.signature;
log_debug ("Signature appears multiple times, deleting duplicate:\n"); log_debug ("Signature appears multiple times, "
log_debug (" sig: class 0x%x, issuer: %s, timestamp: %s (%lld), digest: %02x %02x\n", "deleting duplicate:\n");
log_debug (" sig: class 0x%x, issuer: %s,"
" timestamp: %s (%lld), digest: %02x %02x\n",
sig->sig_class, keystr (sig->keyid), sig->sig_class, keystr (sig->keyid),
isotimestamp (sig->timestamp), isotimestamp (sig->timestamp),
(long long) 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) if (DBG_PACKET && pending_desc)
log_debug ("%s", 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)); sig->pubkey_algo, gpg_strerror (err));
break; break;
} }
@ -614,7 +617,8 @@ check_all_keysigs (KBNODE kb, int only_selected, int only_selfsigs)
{ {
if (DBG_PACKET && pending_desc) if (DBG_PACKET && pending_desc)
log_debug ("%s", 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)); sig->digest_algo, gpg_strerror (err));
break; break;
} }
@ -664,7 +668,8 @@ check_all_keysigs (KBNODE kb, int only_selected, int only_selfsigs)
if (DBG_PACKET) if (DBG_PACKET)
{ {
log_debug ("%s", pending_desc); 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 n2->pkt->pkttype == PKT_USER_ID
? "user id" ? "user id"
: n2->pkt->pkttype == PKT_PUBLIC_SUBKEY : n2->pkt->pkttype == PKT_PUBLIC_SUBKEY
@ -906,7 +911,8 @@ check_all_keysigs (KBNODE kb, int only_selected, int only_selfsigs)
reordered), reordered); reordered), reordered);
if (only_selfsigs && (bad_signature || 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; return modified;
} }
@ -989,7 +995,8 @@ trustsig_prompt (byte * trust_value, byte * trust_depth, char **regexp)
tty_printf ("\n"); tty_printf ("\n");
tty_printf (_("Please enter the depth of this trust signature.\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")); "trust signatures on your behalf.\n"));
tty_printf ("\n"); tty_printf ("\n");