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/tdbio.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/tdbio.c')
| -rw-r--r-- | g10/tdbio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/g10/tdbio.c b/g10/tdbio.c index 43e04b755..0a659b141 100644 --- a/g10/tdbio.c +++ b/g10/tdbio.c @@ -491,7 +491,7 @@ tdbio_set_dbname( const char *new_dbname, int create ) } if(new_dbname==NULL) - fname=make_filename(opt.homedir,"trustdb" EXTSEP_S "gpg", NULL); + fname=make_filename(opt.homedir,"trustdb" EXTSEP_S GPGEXT_GPG, NULL); else if (*new_dbname != DIRSEP_C ) { if (strchr(new_dbname, DIRSEP_C) ) @@ -1239,7 +1239,7 @@ tdbio_read_record( ulong recnum, TRUSTREC *rec, int expected ) case 0: /* unused (free) record */ break; case RECTYPE_VER: /* version record */ - if( memcmp(buf+1, "gpg", 3 ) ) { + if( memcmp(buf+1, GPGEXT_GPG, 3 ) ) { log_error( _("%s: not a trustdb file\n"), db_name ); err = gpg_error (GPG_ERR_TRUSTDB); } @@ -1331,7 +1331,7 @@ tdbio_write_record( TRUSTREC *rec ) case RECTYPE_VER: /* version record */ if( recnum ) BUG(); - memcpy(p-1, "gpg", 3 ); p += 2; + memcpy(p-1, GPGEXT_GPG, 3 ); p += 2; *p++ = rec->r.ver.version; *p++ = rec->r.ver.marginals; *p++ = rec->r.ver.completes; |