From cc9a0b69b698ba436eaf777e5020532845b56236 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 18 Nov 2013 14:09:47 +0100 Subject: 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. --- common/simple-pwquery.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'common/simple-pwquery.c') 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; } -- cgit v1.2.3