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/misc.c | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'g10/misc.c') diff --git a/g10/misc.c b/g10/misc.c index d485c9445..77c8f269c 100644 --- a/g10/misc.c +++ b/g10/misc.c @@ -1242,24 +1242,6 @@ default_compress_algo(void) return DEFAULT_COMPRESS_ALGO; } -const char * -compliance_option_string(void) -{ - char *ver="???"; - - switch(opt.compliance) - { - case CO_GNUPG: return "--gnupg"; - case CO_RFC4880: return "--openpgp"; - case CO_RFC2440: return "--rfc2440"; - case CO_PGP6: return "--pgp6"; - case CO_PGP7: return "--pgp7"; - case CO_PGP8: return "--pgp8"; - case CO_DE_VS: return "--compliance=de-vs"; - } - - return ver; -} void compliance_failure(void) -- cgit v1.2.3