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. --- dirmngr/dirmngr-client.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'dirmngr/dirmngr-client.c') diff --git a/dirmngr/dirmngr-client.c b/dirmngr/dirmngr-client.c index 21f77439b..76f4710c3 100644 --- a/dirmngr/dirmngr-client.c +++ b/dirmngr/dirmngr-client.c @@ -140,7 +140,7 @@ my_strusage (int level) switch(level) { - case 11: p = "dirmngr-client (GnuPG)"; + case 11: p = "dirmngr-client (@GNUPG@)"; break; case 13: p = VERSION; break; case 17: p = PRINTABLE_OS_NAME; break; @@ -440,7 +440,7 @@ start_dirmngr (int only_daemon) assuan_context_t ctx; int try_default = 0; - infostr = opt.force_pipe_server? NULL : getenv ("DIRMNGR_INFO"); + infostr = opt.force_pipe_server? NULL : getenv (DIRMNGR_INFO_NAME); if (only_daemon && (!infostr || !*infostr)) { infostr = xstrdup (dirmngr_socket_name ()); @@ -502,7 +502,8 @@ start_dirmngr (int only_daemon) { if ( !(p = strchr (infostr, ':')) || p == infostr) { - log_error (_("malformed DIRMNGR_INFO environment variable\n")); + log_error (_("malformed %s environment variable\n"), + DIRMNGR_INFO_NAME); xfree (infostr); if (only_daemon) return NULL; -- cgit v1.2.3