* agent/t-protect.c (convert_from_openpgp_native): Sync stub definition. * g10/gpgv.c (keyserver_import_keyid): Sync stub definition. (keyserver_import_cert): Ditto. (keyserver_import_mbox): Ditto. (struct keyserver_spec): Ditto. (parse_keyserver_uri): Ditto. (keyserver_export_pubkey): Ditto. (show_photos): Ditto. * g10/test-stubs.c (keyserver_import_keyid): Sync stub definition. (keyserver_import_cert): Ditto. (keyserver_import_mbox): Ditto. (parse_keyserver_uri): Ditto. (show_photos): Ditto.
-- GnuPG-bug-id: 4416 When building with GCC -flto, some warnings appear because of mismatched definitions in stubs (gpgv or tests). Sync them with the real definitions to fix the warnings, as they just drifted over time. Signed-off-by: Sam James <[email protected]> --- v2: Fixed formatting. agent/t-protect.c | 7 +++++-- g10/gpgv.c | 49 +++++++++++++++++++++++++++++++---------------- g10/test-stubs.c | 37 ++++++++++++++++++++++------------- 3 files changed, 62 insertions(+), 31 deletions(-) diff --git a/agent/t-protect.c b/agent/t-protect.c index e6edbffba..9508de36a 100644 --- a/agent/t-protect.c +++ b/agent/t-protect.c @@ -341,9 +341,12 @@ main (int argc, char **argv) /* Stub function. */ gpg_error_t -convert_from_openpgp_native (gcry_sexp_t s_pgp, const char *passphrase, - unsigned char **r_key) +convert_from_openpgp_native (ctrl_t ctrl, + gcry_sexp_t s_pgp, + const char *passphrase, + unsigned char **r_key) { + (void)ctrl; (void)s_pgp; (void)passphrase; (void)r_key; diff --git a/g10/gpgv.c b/g10/gpgv.c index b65dfa66b..065f06db4 100644 --- a/g10/gpgv.c +++ b/g10/gpgv.c @@ -462,10 +462,13 @@ keyserver_any_configured (ctrl_t ctrl) } int -keyserver_import_keyid (u32 *keyid, void *dummy, unsigned int flags) +keyserver_import_keyid (ctrl_t ctrl, u32 *keyid, + struct keyserver_spec *keyserver, + unsigned int flags) { + (void)ctrl; (void)keyid; - (void)dummy; + (void)keyserver; (void)flags; return -1; } @@ -493,9 +496,14 @@ keyserver_import_fpr_ntds (ctrl_t ctrl, } int -keyserver_import_cert (const char *name) +keyserver_import_cert (ctrl_t ctrl, const char *name, int dane_mode, + unsigned char **fpr,size_t *fpr_len) { + (void)ctrl; (void)name; + (void)dane_mode; + (void)fpr; + (void)fpr_len; return -1; } @@ -511,11 +519,18 @@ keyserver_import_wkd (ctrl_t ctrl, const char *name, unsigned int flags, return GPG_ERR_BUG; } -int -keyserver_import_mbox (const char *name,struct keyserver_spec *spec) +gpg_error_t +keyserver_import_mbox (ctrl_t ctrl, const char *mbox, + unsigned char **fpr,size_t *fpr_len, + struct keyserver_spec *keyserver, + unsigned int flags) { - (void)name; - (void)spec; + (void)ctrl; + (void)mbox; + (void)fpr; + (void)fpr_len; + (void)keyserver; + (void)flags; return -1; } @@ -647,15 +662,14 @@ parse_preferred_keyserver(PKT_signature *sig) return NULL; } -struct keyserver_spec * -parse_keyserver_uri (const char *uri, int require_scheme, - const char *configname, unsigned int configlineno) +gpg_error_t +keyserver_export_pubkey (ctrl_t ctrl, PKT_public_key *pk, + int assume_new_key) { - (void)uri; - (void)require_scheme; - (void)configname; - (void)configlineno; - return NULL; + (void)ctrl; + (void)pk; + (void)assume_new_key; + return 0; } void @@ -666,11 +680,14 @@ free_keyserver_spec (struct keyserver_spec *keyserver) /* Stubs to avoid linking to photoid.c */ void -show_photos (const struct user_attribute *attrs, int count, PKT_public_key *pk) +show_photos (ctrl_t ctrl, const struct user_attribute *attrs, int count, + PKT_public_key *pk, PKT_user_id *uid) { + (void)ctrl; (void)attrs; (void)count; (void)pk; + (void)uid; } int diff --git a/g10/test-stubs.c b/g10/test-stubs.c index 9b41c8929..7b9af8470 100644 --- a/g10/test-stubs.c +++ b/g10/test-stubs.c @@ -193,10 +193,13 @@ keyserver_any_configured (ctrl_t ctrl) } int -keyserver_import_keyid (u32 *keyid, void *dummy, unsigned int flags) +keyserver_import_keyid (ctrl_t ctrl, u32 *keyid, + struct keyserver_spec *keyserver, + unsigned int flags) { + (void)ctrl; (void)keyid; - (void)dummy; + (void)keyserver; (void)flags; return -1; } @@ -224,9 +227,14 @@ keyserver_import_fpr_ntds (ctrl_t ctrl, } int -keyserver_import_cert (const char *name) +keyserver_import_cert (ctrl_t ctrl, const char *name, int dane_mode, + unsigned char **fpr, size_t *fpr_len) { + (void)ctrl; (void)name; + (void)dane_mode; + (void)fpr; + (void)fpr_len; return -1; } @@ -242,15 +250,18 @@ keyserver_import_wkd (ctrl_t ctrl, const char *name, unsigned int flags, return GPG_ERR_BUG; } -int -keyserver_import_mbox (ctrl_t ctrl, const char *mbox, unsigned char **fpr, - size_t *fprlen, struct keyserver_spec *keyserver) +gpg_error_t +keyserver_import_mbox (ctrl_t ctrl, const char *mbox, + unsigned char **fpr,size_t *fpr_len, + struct keyserver_spec *keyserver, + unsigned int flags) { (void)ctrl; (void)mbox; (void)fpr; - (void)fprlen; + (void)fpr_len; (void)keyserver; + (void)flags; return -1; } @@ -382,13 +393,10 @@ parse_preferred_keyserver(PKT_signature *sig) } struct keyserver_spec * -parse_keyserver_uri (const char *uri, int require_scheme, - const char *configname, unsigned int configlineno) +parse_keyserver_uri (const char *string, int require_scheme) { - (void)uri; + (void)string; (void)require_scheme; - (void)configname; - (void)configlineno; return NULL; } @@ -400,11 +408,14 @@ free_keyserver_spec (struct keyserver_spec *keyserver) /* Stubs to avoid linking to photoid.c */ void -show_photos (const struct user_attribute *attrs, int count, PKT_public_key *pk) +show_photos (ctrl_t ctrl, const struct user_attribute *attrs, int count, + PKT_public_key *pk, PKT_user_id *uid) { + (void)ctrl; (void)attrs; (void)count; (void)pk; + (void)uid; } int -- 2.52.0 _______________________________________________ Gnupg-devel mailing list [email protected] https://lists.gnupg.org/mailman/listinfo/gnupg-devel
