svn commit: samba r13996 - in branches/SAMBA_4_0/source/lib/ldb:
common include ldb_ildap ldb_ldap ldb_sqlite3 ldb_tdb modules
idra at samba.org
idra at samba.org
Tue Mar 7 21:16:36 GMT 2006
Author: idra
Date: 2006-03-07 21:16:35 +0000 (Tue, 07 Mar 2006)
New Revision: 13996
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13996
Log:
simplify ldb_async_wait() some more
Modified:
branches/SAMBA_4_0/source/lib/ldb/common/ldb.c
branches/SAMBA_4_0/source/lib/ldb/include/ldb.h
branches/SAMBA_4_0/source/lib/ldb/ldb_ildap/ldb_ildap.c
branches/SAMBA_4_0/source/lib/ldb/ldb_ldap/ldb_ldap.c
branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_search.c
branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.c
branches/SAMBA_4_0/source/lib/ldb/modules/sort.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/common/ldb.c 2006-03-07 21:13:25 UTC (rev 13995)
+++ branches/SAMBA_4_0/source/lib/ldb/common/ldb.c 2006-03-07 21:16:35 UTC (rev 13996)
@@ -231,7 +231,7 @@
return status;
}
-int ldb_async_wait(struct ldb_context *ldb, struct ldb_async_handle *handle, enum ldb_async_wait_type type)
+int ldb_async_wait(struct ldb_async_handle *handle, enum ldb_async_wait_type type)
{
return handle->module->ops->async_wait(handle, type);
}
Modified: branches/SAMBA_4_0/source/lib/ldb/include/ldb.h
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/include/ldb.h 2006-03-07 21:13:25 UTC (rev 13995)
+++ branches/SAMBA_4_0/source/lib/ldb/include/ldb.h 2006-03-07 21:16:35 UTC (rev 13996)
@@ -664,7 +664,7 @@
int ldb_request(struct ldb_context *ldb, struct ldb_request *request);
-int ldb_async_wait(struct ldb_context *ldb, struct ldb_async_handle *handle, enum ldb_async_wait_type type);
+int ldb_async_wait(struct ldb_async_handle *handle, enum ldb_async_wait_type type);
/**
Initialise ldbs' global information
Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_ildap/ldb_ildap.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/ldb_ildap/ldb_ildap.c 2006-03-07 21:13:25 UTC (rev 13995)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_ildap/ldb_ildap.c 2006-03-07 21:16:35 UTC (rev 13996)
@@ -539,7 +539,7 @@
res, &ildb_search_sync_callback, ildb->ldap->timeout, &handle);
if (ret == LDB_SUCCESS) {
- ret = ldb_async_wait(module->ldb, handle, LDB_WAIT_ALL);
+ ret = ldb_async_wait(handle, LDB_WAIT_ALL);
talloc_free(handle);
}
@@ -616,7 +616,7 @@
if (ret != LDB_SUCCESS)
return ret;
- ret = ldb_async_wait(module->ldb, handle, LDB_WAIT_ALL);
+ ret = ldb_async_wait(handle, LDB_WAIT_ALL);
talloc_free(handle);
return ret;
@@ -688,7 +688,7 @@
if (ret != LDB_SUCCESS)
return ret;
- ret = ldb_async_wait(module->ldb, handle, LDB_WAIT_ALL);
+ ret = ldb_async_wait(handle, LDB_WAIT_ALL);
talloc_free(handle);
return ret;
@@ -741,7 +741,7 @@
if (ret != LDB_SUCCESS)
return ret;
- ret = ldb_async_wait(module->ldb, handle, LDB_WAIT_ALL);
+ ret = ldb_async_wait(handle, LDB_WAIT_ALL);
talloc_free(handle);
return ret;
@@ -813,7 +813,7 @@
if (ret != LDB_SUCCESS)
return ret;
- ret = ldb_async_wait(module->ldb, handle, LDB_WAIT_ALL);
+ ret = ldb_async_wait(handle, LDB_WAIT_ALL);
talloc_free(handle);
return ret;
Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_ldap/ldb_ldap.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/ldb_ldap/ldb_ldap.c 2006-03-07 21:13:25 UTC (rev 13995)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_ldap/ldb_ldap.c 2006-03-07 21:16:35 UTC (rev 13996)
@@ -398,7 +398,7 @@
res, &lldb_search_sync_callback, lldb->timeout, &handle);
if (ret == LDB_SUCCESS) {
- ret = ldb_async_wait(module->ldb, handle, LDB_WAIT_ALL);
+ ret = ldb_async_wait(handle, LDB_WAIT_ALL);
talloc_free(handle);
}
@@ -477,7 +477,7 @@
if (ret != LDB_SUCCESS)
return ret;
- ret = ldb_async_wait(module->ldb, handle, LDB_WAIT_ALL);
+ ret = ldb_async_wait(handle, LDB_WAIT_ALL);
talloc_free(handle);
return ret;
@@ -552,7 +552,7 @@
if (ret != LDB_SUCCESS)
return ret;
- ret = ldb_async_wait(module->ldb, handle, LDB_WAIT_ALL);
+ ret = ldb_async_wait(handle, LDB_WAIT_ALL);
talloc_free(handle);
return ret;
@@ -615,7 +615,7 @@
if (ret != LDB_SUCCESS)
return ret;
- ret = ldb_async_wait(module->ldb, handle, LDB_WAIT_ALL);
+ ret = ldb_async_wait(handle, LDB_WAIT_ALL);
talloc_free(handle);
return ret;
@@ -698,7 +698,7 @@
if (ret != LDB_SUCCESS)
return ret;
- ret = ldb_async_wait(module->ldb, handle, LDB_WAIT_ALL);
+ ret = ldb_async_wait(handle, LDB_WAIT_ALL);
talloc_free(handle);
return ret;
Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3/ldb_sqlite3.c 2006-03-07 21:13:25 UTC (rev 13995)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3/ldb_sqlite3.c 2006-03-07 21:16:35 UTC (rev 13996)
@@ -1085,7 +1085,7 @@
&handle);
if (ret == LDB_SUCCESS) {
- ret = ldb_async_wait(module->ldb, handle, LDB_WAIT_ALL);
+ ret = ldb_async_wait(handle, LDB_WAIT_ALL);
talloc_free(handle);
}
@@ -1247,7 +1247,7 @@
if (ret != LDB_SUCCESS)
return ret;
- ret = ldb_async_wait(module->ldb, handle, LDB_WAIT_ALL);
+ ret = ldb_async_wait(handle, LDB_WAIT_ALL);
talloc_free(handle);
return ret;
@@ -1461,7 +1461,7 @@
if (ret != LDB_SUCCESS)
return ret;
- ret = ldb_async_wait(module->ldb, handle, LDB_WAIT_ALL);
+ ret = ldb_async_wait(handle, LDB_WAIT_ALL);
talloc_free(handle);
return ret;
@@ -1540,7 +1540,7 @@
if (ret != LDB_SUCCESS)
return ret;
- ret = ldb_async_wait(module->ldb, handle, LDB_WAIT_ALL);
+ ret = ldb_async_wait(handle, LDB_WAIT_ALL);
talloc_free(handle);
return ret;
@@ -1621,7 +1621,7 @@
if (ret != LDB_SUCCESS)
return ret;
- ret = ldb_async_wait(module->ldb, handle, LDB_WAIT_ALL);
+ ret = ldb_async_wait(handle, LDB_WAIT_ALL);
talloc_free(handle);
return ret;
Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_search.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_search.c 2006-03-07 21:13:25 UTC (rev 13995)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_search.c 2006-03-07 21:16:35 UTC (rev 13996)
@@ -596,7 +596,7 @@
&handle);
if (ret == LDB_SUCCESS) {
- ret = ldb_async_wait(module->ldb, handle, LDB_WAIT_ALL);
+ ret = ldb_async_wait(handle, LDB_WAIT_ALL);
talloc_free(handle);
}
Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.c 2006-03-07 21:13:25 UTC (rev 13995)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.c 2006-03-07 21:16:35 UTC (rev 13996)
@@ -309,7 +309,7 @@
if (ret != LDB_SUCCESS)
return ret;
- ret = ldb_async_wait(module->ldb, handle, LDB_WAIT_ALL);
+ ret = ldb_async_wait(handle, LDB_WAIT_ALL);
talloc_free(handle);
return ret;
@@ -413,7 +413,7 @@
if (ret != LDB_SUCCESS)
return ret;
- ret = ldb_async_wait(module->ldb, handle, LDB_WAIT_ALL);
+ ret = ldb_async_wait(handle, LDB_WAIT_ALL);
talloc_free(handle);
return ret;
@@ -786,7 +786,7 @@
if (ret != LDB_SUCCESS)
return ret;
- ret = ldb_async_wait(module->ldb, handle, LDB_WAIT_ALL);
+ ret = ldb_async_wait(handle, LDB_WAIT_ALL);
talloc_free(handle);
return ret;
@@ -872,7 +872,7 @@
if (ret != LDB_SUCCESS)
return ret;
- ret = ldb_async_wait(module->ldb, handle, LDB_WAIT_ALL);
+ ret = ldb_async_wait(handle, LDB_WAIT_ALL);
talloc_free(handle);
return ret;
Modified: branches/SAMBA_4_0/source/lib/ldb/modules/sort.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/modules/sort.c 2006-03-07 21:13:25 UTC (rev 13995)
+++ branches/SAMBA_4_0/source/lib/ldb/modules/sort.c 2006-03-07 21:16:35 UTC (rev 13996)
@@ -525,7 +525,7 @@
ac = talloc_get_type(handle->private_data, struct sort_async_context);
- ret = ldb_async_wait(handle->module->ldb, ac->req->async.handle, type);
+ ret = ldb_async_wait(ac->req->async.handle, type);
if (ret != LDB_SUCCESS) {
handle->status = ret;
More information about the samba-cvs
mailing list