diff options
| author | Werner Koch <[email protected]> | 2013-11-18 13:09:47 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2013-11-18 13:09:47 +0000 |
| commit | cc9a0b69b698ba436eaf777e5020532845b56236 (patch) | |
| tree | cb2274c3d97fffa7020cb1e5a56373935ee094b2 /agent/preset-passphrase.c | |
| parent | Add strusage macro replacement feature. (diff) | |
| download | gnupg-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 'agent/preset-passphrase.c')
| -rw-r--r-- | agent/preset-passphrase.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/agent/preset-passphrase.c b/agent/preset-passphrase.c index 3f7933638..e0cb77ea8 100644 --- a/agent/preset-passphrase.c +++ b/agent/preset-passphrase.c @@ -87,7 +87,7 @@ my_strusage (int level) const char *p; switch (level) { - case 11: p = "gpg-preset-passphrase (GnuPG)"; + case 11: p = "gpg-preset-passphrase (@GNUPG@)"; break; case 13: p = VERSION; break; case 17: p = PRINTABLE_OS_NAME; break; @@ -245,7 +245,7 @@ main (int argc, char **argv) /* Tell simple-pwquery about the the standard socket name. */ { - char *tmp = make_filename (opt_homedir, "S.gpg-agent", NULL); + char *tmp = make_filename (opt_homedir, GPG_AGENT_SOCK_NAME, NULL); simple_pw_set_socket (tmp); xfree (tmp); } |