summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2009-04-01 12:51:53 +0200
committerWerner Koch <wk@gnupg.org>2009-04-01 12:51:53 +0200
commitf8b4cd76501824d56d3cf78a8ba85291a62f0e6d (patch)
treecec902ba7d3dd1a38846805cf491a65b95bb79cd /tools
parentImplement decryption for TCOS 3 cards. (diff)
downloadgnupg2-f8b4cd76501824d56d3cf78a8ba85291a62f0e6d.tar.xz
gnupg2-f8b4cd76501824d56d3cf78a8ba85291a62f0e6d.zip
Import/export of pkcs#12 now uses the gpg-agent directly.
Removed duplicated code (percent unescaping).
Diffstat (limited to 'tools')
-rw-r--r--tools/gpg-connect-agent.c2
-rw-r--r--tools/gpgconf-comp.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c
index ba97c1a10..06dafd5c9 100644
--- a/tools/gpg-connect-agent.c
+++ b/tools/gpg-connect-agent.c
@@ -215,7 +215,7 @@ gnu_getcwd (void)
}
-/* Unescale STRING and returned the malloced result. The surrounding
+/* Unescape STRING and returned the malloced result. The surrounding
quotes must already be removed from STRING. */
static char *
unescape_string (const char *string)
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 92016efc4..7ba526f69 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -1141,7 +1141,7 @@ my_dgettext (const char *domain, const char *msgid)
/* FIXME: we have no dgettext, thus we can't switch. */
- text = gettext (msgid);
+ text = (char*)gettext (msgid);
return text ? text : msgid;
}
#elif defined(ENABLE_NLS)