aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2015-11-27 17:23:33 +0000
committerWerner Koch <[email protected]>2015-11-27 17:32:27 +0000
commit686f31c3d5aee0d2825265869ae92ca95cdcabae (patch)
treef0c0357ca47739ec9d57cd9a98125118c8c18688
parentkbx: Include gpg-error prior to mischelp.h. (diff)
downloadgnupg-686f31c3d5aee0d2825265869ae92ca95cdcabae.tar.gz
gnupg-686f31c3d5aee0d2825265869ae92ca95cdcabae.zip
gpg: Avoid extra translation strings.
* g10/keyedit.c (menu_expire): Use only one prompt. -- The old code was anyway not fully i18n because it did not used ngettext. Further we ran into const char*/char* conflicts on Windows where we use a different gettext implementation. FWIW: A better pattern in the case of a static and a malloced string w/o error return on malloc failure would be: const char *s; char *s_buf; s_buf = xtryasprintf ("%d foo", n); if (!s_buf) s = "several foo"; else s = s_buf; bar (s); xfree (s_buf);
Diffstat (limited to '')
-rw-r--r--g10/keyedit.c20
1 files changed, 4 insertions, 16 deletions
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 9cf6f44ea..d7c70e626 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -4003,22 +4003,10 @@ menu_expire (KBNODE pub_keyblock)
n1 = count_selected_keys (pub_keyblock);
if (n1 > 1)
{
- char *s = xtryasprintf (_("Are you sure you want to change the"
- " expiration time %d subkeys? (y/N) "), n1);
- int s_need_free;
- if (s)
- s_need_free = 0;
- else
- {
- s = _("Are you sure you want to change the"
- " expiration time for multiple subkeys? (y/N) ");
- s_need_free = 0;
- }
-
- rc = cpr_get_answer_is_yes ("keyedit.expire_multiple_subkeys.okay", s);
- if (s_need_free)
- xfree (s);
- if (! rc)
+ if (!cpr_get_answer_is_yes
+ ("keyedit.expire_multiple_subkeys.okay",
+ _("Are you sure you want to change the"
+ " expiration time for multiple subkeys? (y/N) ")))
return 0;
}
else if (n1)