From d4a32ae5c6e60dc342d9b19f5aa0d1f4bc89027c Mon Sep 17 00:00:00 2001 From: "Neal H. Walfield" Date: Sat, 28 Mar 2015 17:23:56 +0100 Subject: dirmngr: Better encapsulate the keyservers variable. * dirmngr/dirmngr.h (struct server_control_s): Move field keyservers from here... * dirmngr/server.c (struct server_local_s): ... to here. Update users. * dirmngr/ks-action.h (ks_action_resolve): Add argument keyservers. (ks_action_search): Likewise. (ks_action_get): Likewise. (ks_action_put): Likewise. * dirmngr/ks-action.c (ks_action_resolve): Add argument keyservers. Use it instead of ctrl->keyservers. (ks_action_search): Likewise. (ks_action_get): Likewise. (ks_action_put): Likewise. -- Signed-off-by: Neal H. Walfield --- dirmngr/ks-action.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'dirmngr/ks-action.h') diff --git a/dirmngr/ks-action.h b/dirmngr/ks-action.h index 2def3dce1..c373bf9fd 100644 --- a/dirmngr/ks-action.h +++ b/dirmngr/ks-action.h @@ -22,11 +22,14 @@ #define DIRMNGR_KS_ACTION_H 1 gpg_error_t ks_action_help (ctrl_t ctrl, const char *url); -gpg_error_t ks_action_resolve (ctrl_t ctrl); -gpg_error_t ks_action_search (ctrl_t ctrl, strlist_t patterns, estream_t outfp); -gpg_error_t ks_action_get (ctrl_t ctrl, strlist_t patterns, estream_t outfp); +gpg_error_t ks_action_resolve (ctrl_t ctrl, uri_item_t keyservers); +gpg_error_t ks_action_search (ctrl_t ctrl, uri_item_t keyservers, + strlist_t patterns, estream_t outfp); +gpg_error_t ks_action_get (ctrl_t ctrl, uri_item_t keyservers, + strlist_t patterns, estream_t outfp); gpg_error_t ks_action_fetch (ctrl_t ctrl, const char *url, estream_t outfp); -gpg_error_t ks_action_put (ctrl_t ctrl, void *data, size_t datalen, +gpg_error_t ks_action_put (ctrl_t ctrl, uri_item_t keyservers, + void *data, size_t datalen, void *info, size_t infolen); -- cgit v1.2.3