diff options
| author | Werner Koch <[email protected]> | 2016-06-07 08:59:46 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-06-07 08:59:46 +0000 |
| commit | 22a7ef01aa2c0eb77bcc40174d09104acc35cab1 (patch) | |
| tree | 3782b20549fcc48d2598128676227d9a16f785b6 /tools/gpg-check-pattern.c | |
| parent | po: Update Japanese translation. (diff) | |
| download | gnupg-22a7ef01aa2c0eb77bcc40174d09104acc35cab1.tar.gz gnupg-22a7ef01aa2c0eb77bcc40174d09104acc35cab1.zip | |
Replace use of opt.homedir by accessor functions.
* common/homedir.c (the_gnupg_homedir): New var.
(gnupg_set_homedir): New.
(gnupg_homedir): New.
* g10/options.h (struct opt): Remove 'homedir' and replace all users
by the new accessor functions.
* g13/g13-common.h (struct opt): Ditto.
* scd/scdaemon.h (struct opt): Ditto.
* sm/gpgsm.h (struct opt): Ditto.
* dirmngr/dirmngr.h (struct opt): Ditto.
* agent/preset-passphrase.c (opt_homedir): Ditto.
* agent/protect-tool.c (opt_homedir): Ditto.
--
This will make detection of a non-default homedir easier.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'tools/gpg-check-pattern.c')
| -rw-r--r-- | tools/gpg-check-pattern.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tools/gpg-check-pattern.c b/tools/gpg-check-pattern.c index fbf30a254..37283a1d4 100644 --- a/tools/gpg-check-pattern.c +++ b/tools/gpg-check-pattern.c @@ -181,8 +181,6 @@ main (int argc, char **argv ) setup_libgcrypt_logging (); gcry_control (GCRYCTL_INIT_SECMEM, 4096, 0); - opt.homedir = default_homedir (); - pargs.argc = &argc; pargs.argv = &argv; pargs.flags= 1; /* (do not remove the args) */ @@ -191,7 +189,7 @@ main (int argc, char **argv ) switch (pargs.r_opt) { case oVerbose: opt.verbose++; break; - case oHomedir: opt.homedir = pargs.r.ret_str; break; + case oHomedir: gnupg_set_homedir (pargs.r.ret_str); break; case oCheck: opt.checkonly = 1; break; case oNull: opt.null = 1; break; |