diff options
| author | Werner Koch <wk@gnupg.org> | 2013-11-18 14:09:47 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2013-11-18 14:09:47 +0100 |
| commit | cc9a0b69b698ba436eaf777e5020532845b56236 (patch) | |
| tree | cb2274c3d97fffa7020cb1e5a56373935ee094b2 /g10/gpgv.c | |
| parent | Add strusage macro replacement feature. (diff) | |
| download | gnupg2-cc9a0b69b698ba436eaf777e5020532845b56236.tar.xz gnupg2-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 'g10/gpgv.c')
| -rw-r--r-- | g10/gpgv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/gpgv.c b/g10/gpgv.c index 5cb9c55b5..c11d9d3d1 100644 --- a/g10/gpgv.c +++ b/g10/gpgv.c @@ -108,7 +108,7 @@ my_strusage( int level ) switch (level) { - case 11: p = "gpgv (GnuPG)"; + case 11: p = "@GPG@v (GnuPG)"; break; case 13: p = VERSION; break; case 17: p = PRINTABLE_OS_NAME; break; @@ -198,7 +198,7 @@ main( int argc, char **argv ) /* Note: We open all keyrings in read-only mode. */ if (!nrings) /* No keyring given: use default one. */ - keydb_add_resource ("trustedkeys" EXTSEP_S "gpg", + keydb_add_resource ("trustedkeys" EXTSEP_S GPGEXT_GPG, KEYDB_RESOURCE_FLAG_READONLY); for (sl = nrings; sl; sl = sl->next) keydb_add_resource (sl->d, KEYDB_RESOURCE_FLAG_READONLY); |