summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-11-16 06:14:36 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:52 -0500
commite81157c7379116d83b9906e27c9fd418c779d129 (patch)
tree1f1d6db42d89e48aaf79c99ec24a74663f0ed108
parente2ebe810873f1e5f5592e7378f130e87904d8de2 (diff)
downloadsamba-e81157c7379116d83b9906e27c9fd418c779d129.tar.gz
samba-e81157c7379116d83b9906e27c9fd418c779d129.tar.bz2
samba-e81157c7379116d83b9906e27c9fd418c779d129.zip
r3782: use ldb_ namespace
metze (This used to be commit 9003698e0fba28551d41d41dec159cc9c42ce7d2)
-rw-r--r--source4/lib/ldb/common/util.c2
-rw-r--r--source4/lib/ldb/ldb_tdb/ldb_index.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/lib/ldb/common/util.c b/source4/lib/ldb/common/util.c
index 68537a7864..c8aa5019e2 100644
--- a/source4/lib/ldb/common/util.c
+++ b/source4/lib/ldb/common/util.c
@@ -41,7 +41,7 @@
return -1 if not found, or the index of the first occurance of needle if found
*/
-int list_find(const void *needle,
+int ldb_list_find(const void *needle,
const void *base, size_t nmemb, size_t size, comparison_fn_t comp_fn)
{
const char *base_p = base;
diff --git a/source4/lib/ldb/ldb_tdb/ldb_index.c b/source4/lib/ldb/ldb_tdb/ldb_index.c
index d54208777d..93e358e4d2 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_index.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_index.c
@@ -272,7 +272,7 @@ static int list_intersect(struct ldb_context *ldb,
list3.count = 0;
for (i=0;i<list->count;i++) {
- if (list_find(list->dn[i], list2->dn, list2->count,
+ if (ldb_list_find(list->dn[i], list2->dn, list2->count,
sizeof(char *), (comparison_fn_t)strcmp) != -1) {
list3.dn[list3.count] = list->dn[i];
list3.count++;
@@ -315,7 +315,7 @@ static int list_union(struct ldb_context *ldb,
list->dn = d;
for (i=0;i<list2->count;i++) {
- if (list_find(list2->dn[i], list->dn, count,
+ if (ldb_list_find(list2->dn[i], list->dn, count,
sizeof(char *), (comparison_fn_t)strcmp) == -1) {
list->dn[list->count] = ldb_strdup(ldb, list2->dn[i]);
if (!list->dn[list->count]) {