Hello,
please see attached trivial patch.
Thanks,
Pavel Reichl
On (21/07/14 22:13), Pavel Reichl wrote:
Hello,
please see attached trivial patch.
Thanks,
Pavel Reichl
From 649762a6433066464ae22fe8a3399f0fe4b0d24c Mon Sep 17 00:00:00 2001 From: Pavel Reichl preichl@redhat.com Date: Mon, 21 Jul 2014 21:01:56 +0100 Subject: [PATCH] SDAP: remove duplicated code
Body of functions sdap_x_deref_search_done(), sdap_asq_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() and from sdap_asq_search_done() instead of having two more duplicate implementations.
src/providers/ldap/sdap_async.c | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-)
diff --git a/src/providers/ldap/sdap_async.c b/src/providers/ldap/sdap_async.c index 590cbe100bdf5f3d6df8d9d7b356fd1d560cd729..31ae904df6a79f8703d5c1838f2ddb2d8029618c 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) @@ -2225,21 +2211,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);
And one more please: sdap_sd_search_done
LS
On 07/21/2014 11:57 PM, Lukas Slebodnik wrote:
On (21/07/14 22:13), Pavel Reichl wrote:
Hello,
please see attached trivial patch.
Thanks,
Pavel Reichl From 649762a6433066464ae22fe8a3399f0fe4b0d24c Mon Sep 17 00:00:00 2001 From: Pavel Reichl preichl@redhat.com Date: Mon, 21 Jul 2014 21:01:56 +0100 Subject: [PATCH] SDAP: remove duplicated code
Body of functions sdap_x_deref_search_done(), sdap_asq_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() and from sdap_asq_search_done() instead of having two more duplicate implementations.
src/providers/ldap/sdap_async.c | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-)
diff --git a/src/providers/ldap/sdap_async.c b/src/providers/ldap/sdap_async.c index 590cbe100bdf5f3d6df8d9d7b356fd1d560cd729..31ae904df6a79f8703d5c1838f2ddb2d8029618c 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) @@ -2225,21 +2211,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);
And one more please: sdap_sd_search_done
LS _______________________________________________ sssd-devel mailing list sssd-devel@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/sssd-devel
Thanks, nice catch!
On (22/07/14 08:48), Pavel Reichl wrote:
On 07/21/2014 11:57 PM, Lukas Slebodnik wrote:
On (21/07/14 22:13), Pavel Reichl wrote:
Hello,
please see attached trivial patch.
Thanks,
Pavel Reichl
From e1097b44fe561909a56e1c9c646fc6eb59b89764 Mon Sep 17 00:00:00 2001 From: Pavel Reichl preichl@redhat.com Date: Mon, 21 Jul 2014 21:01:56 +0100 Subject: [PATCH] SDAP: remove duplicated code
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.
src/providers/ldap/sdap_async.c | 47 +++-------------------------------------- 1 file changed, 3 insertions(+), 44 deletions(-)
ACK
LS
On Tue, Jul 22, 2014 at 09:33:36AM +0200, Lukas Slebodnik wrote:
On (22/07/14 08:48), Pavel Reichl wrote:
On 07/21/2014 11:57 PM, Lukas Slebodnik wrote:
On (21/07/14 22:13), Pavel Reichl wrote:
Hello,
please see attached trivial patch.
Thanks,
Pavel Reichl
From e1097b44fe561909a56e1c9c646fc6eb59b89764 Mon Sep 17 00:00:00 2001 From: Pavel Reichl preichl@redhat.com Date: Mon, 21 Jul 2014 21:01:56 +0100 Subject: [PATCH] SDAP: remove duplicated code
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.
src/providers/ldap/sdap_async.c | 47 +++-------------------------------------- 1 file changed, 3 insertions(+), 44 deletions(-)
ACK
LS
* master: d8dc383c438fad9b3b5ce4ad9e5c67271b22bf3a
sssd-devel@lists.fedorahosted.org
-
Jakub Hrozek -
Lukas Slebodnik -
Pavel Reichl