From 2cd8bae23d7382588cf096df3eed83e02331a2bf Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 1 Sep 2020 20:43:57 +0200 Subject: Use only one copy of the warn_server_mismatch function. * common/asshelp.c (warn_server_version_mismatch): New. Actually a slightly modified version of warn_version_mismatch found in other modules. * common/status.c (gnupg_status_strings): New. * g10/cpr.c (write_status_strings2): New. * g10/call-agent.c (warn_version_mismatch): Use the new unified warn_server_version_mismatch function. * g10/call-dirmngr.c (warn_version_mismatch): Ditto. * g10/call-keyboxd.c (warn_version_mismatch): Ditto. * sm/call-agent.c (warn_version_mismatch): Ditto. * sm/call-dirmngr.c (warn_version_mismatch): Ditto. * tools/card-call-scd.c (warn_version_mismatch): Ditto. Signed-off-by: Werner Koch --- common/asshelp.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'common/asshelp.h') diff --git a/common/asshelp.h b/common/asshelp.h index b2f4e538f..e7e43bd1b 100644 --- a/common/asshelp.h +++ b/common/asshelp.h @@ -89,6 +89,16 @@ start_new_dirmngr (assuan_context_t *r_ctx, gpg_error_t get_assuan_server_version (assuan_context_t ctx, int mode, char **r_version); +/* Print a server version mismatch warning. */ +gpg_error_t warn_server_version_mismatch (assuan_context_t ctx, + const char *servername, int mode, + gpg_error_t (*status_fnc) + (ctrl_t ctrl, + int status_id, + ...), + void *status_func_ctrl, + int print_hints); + /*-- asshelp2.c --*/ -- cgit v1.2.3