From f440cf73eab0b0e75e3cb2e8c9e70a77f20ef1dc Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Wed, 7 Jun 2017 12:33:36 +0200 Subject: common,gpg: Move the compliance option printer. * common/compliance.c (gnupg_compliance_option_string): New function. * common/compliance.h (gnupg_compliance_option_string): New prototype. * g10/encrypt.c (write_pubkey_enc_from_list): Update callsite. * g10/gpg.c (main): Likewise. * g10/keyedit.c (keyedit_menu): Likewise. * g10/pkclist.c (build_pk_list): Likewise. * g10/main.h (compliance_option_string): Remove prototype. * g10/misc.c (compliance_option_string): Remove function. GnuPG-bug-id: 3191 Signed-off-by: Justus Winter --- g10/pkclist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'g10/pkclist.c') diff --git a/g10/pkclist.c b/g10/pkclist.c index ab024d9f2..48cfe4548 100644 --- a/g10/pkclist.c +++ b/g10/pkclist.c @@ -1028,7 +1028,7 @@ build_pk_list (ctrl_t ctrl, strlist_t rcpts, PK_LIST *ret_pk_list) { log_info(_("you may not use %s while in %s mode\n"), "--hidden-recipient", - compliance_option_string()); + gnupg_compliance_option_string (opt.compliance)); compliance_failure(); } @@ -1079,7 +1079,7 @@ build_pk_list (ctrl_t ctrl, strlist_t rcpts, PK_LIST *ret_pk_list) { log_info(_("you may not use %s while in %s mode\n"), "--hidden-encrypt-to", - compliance_option_string()); + gnupg_compliance_option_string (opt.compliance)); compliance_failure(); } -- cgit v1.2.3