From d8dc383c438fad9b3b5ce4ad9e5c67271b22bf3a Mon Sep 17 00:00:00 2001 From: Pavel Reichl Date: Mon, 21 Jul 2014 21:01:56 +0100 Subject: SDAP: remove duplicated code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Body of functions sdap_x_deref_search_done(), sdap_asq_search_done(), sdap_sd_search_done and sdap_get_generic_done() are the same. Remove code duplication by calling sdap_get_generic_done() from sdap_x_deref_search_done(), sdap_sd_search_done and from sdap_asq_search_done() instead of having two more duplicate implementations. Reviewed-by: Lukáš Slebodník --- src/providers/ldap/sdap_async.c | 47 +++-------------------------------------- 1 file changed, 3 insertions(+), 44 deletions(-) (limited to 'src') diff --git a/src/providers/ldap/sdap_async.c b/src/providers/ldap/sdap_async.c index 590cbe10..2959862d 100644 --- a/src/providers/ldap/sdap_async.c +++ b/src/providers/ldap/sdap_async.c @@ -1785,21 +1785,7 @@ done: static void sdap_x_deref_search_done(struct tevent_req *subreq) { - struct tevent_req *req = tevent_req_callback_data(subreq, - struct tevent_req); - int ret; - - ret = sdap_get_generic_ext_recv(subreq); - talloc_zfree(subreq); - if (ret) { - DEBUG(SSSDBG_CONF_SETTINGS, - "sdap_get_generic_ext_recv failed [%d]: %s\n", - ret, sss_strerror(ret)); - tevent_req_error(req, ret); - return; - } - - tevent_req_done(req); + sdap_get_generic_done(subreq); } static int sdap_x_deref_search_ctrls_destructor(void *ptr) @@ -1968,20 +1954,7 @@ static errno_t sdap_sd_search_parse_entry(struct sdap_handle *sh, static void sdap_sd_search_done(struct tevent_req *subreq) { - struct tevent_req *req = tevent_req_callback_data(subreq, - struct tevent_req); - int ret; - ret = sdap_get_generic_ext_recv(subreq); - talloc_zfree(subreq); - if (ret) { - DEBUG(SSSDBG_MINOR_FAILURE, - "sdap_get_generic_ext_recv failed [%d]: %s\n", - ret, sss_strerror(ret)); - tevent_req_error(req, ret); - return; - } - - tevent_req_done(req); + sdap_get_generic_done(subreq); } static int sdap_sd_search_ctrls_destructor(void *ptr) @@ -2225,21 +2198,7 @@ done: static void sdap_asq_search_done(struct tevent_req *subreq) { - struct tevent_req *req = tevent_req_callback_data(subreq, - struct tevent_req); - int ret; - - ret = sdap_get_generic_ext_recv(subreq); - talloc_zfree(subreq); - if (ret) { - DEBUG(SSSDBG_CONF_SETTINGS, - "sdap_get_generic_ext_recv failed [%d]: %s\n", - ret, sss_strerror(ret)); - tevent_req_error(req, ret); - return; - } - - tevent_req_done(req); + sdap_get_generic_done(subreq); } static int sdap_asq_search_ctrls_destructor(void *ptr) -- cgit