From 22a7ef01aa2c0eb77bcc40174d09104acc35cab1 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 7 Jun 2016 10:59:46 +0200 Subject: 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 --- tools/gpg-check-pattern.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'tools/gpg-check-pattern.c') 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; -- cgit v1.2.3