aboutsummaryrefslogtreecommitdiffstats
path: root/common/simple-pwquery.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2013-11-18 13:09:47 +0000
committerWerner Koch <[email protected]>2013-11-18 13:09:47 +0000
commitcc9a0b69b698ba436eaf777e5020532845b56236 (patch)
treecb2274c3d97fffa7020cb1e5a56373935ee094b2 /common/simple-pwquery.c
parentAdd strusage macro replacement feature. (diff)
downloadgnupg-cc9a0b69b698ba436eaf777e5020532845b56236.tar.gz
gnupg-cc9a0b69b698ba436eaf777e5020532845b56236.zip
Make use of the *_NAME etc macros.
Replace hardwired strings at many places with new macros from config.h and use the new strusage macro replacement feature. * common/asshelp.c (lock_spawning) [W32]: Change the names of the spawn sentinels. * agent/command.c (cmd_import_key): Use asprintf to create the prompt.
Diffstat (limited to 'common/simple-pwquery.c')
-rw-r--r--common/simple-pwquery.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/simple-pwquery.c b/common/simple-pwquery.c
index 08f59d246..7dcc05747 100644
--- a/common/simple-pwquery.c
+++ b/common/simple-pwquery.c
@@ -329,7 +329,7 @@ agent_open (int *rfd)
int nread;
*rfd = -1;
- infostr = getenv ( "GPG_AGENT_INFO" );
+ infostr = getenv (GPG_AGENT_INFO_NAME);
if ( !infostr || !*infostr )
infostr = default_gpg_agent_info;
if ( !infostr || !*infostr )
@@ -349,7 +349,7 @@ agent_open (int *rfd)
|| (p-infostr)+1 >= sizeof client_addr.sun_path )
{
#ifdef SPWQ_USE_LOGGING
- log_error ( _("malformed GPG_AGENT_INFO environment variable\n"));
+ log_error (_("malformed %s environment variable\n"), GPG_AGENT_INFO_NAME);
#endif
return SPWQ_NO_AGENT;
}