From e81157c7379116d83b9906e27c9fd418c779d129 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 16 Nov 2004 06:14:36 +0000
Subject: r3782: use ldb_ namespace

metze
(This used to be commit 9003698e0fba28551d41d41dec159cc9c42ce7d2)
---
 source4/lib/ldb/common/util.c       | 2 +-
 source4/lib/ldb/ldb_tdb/ldb_index.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'source4')

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]) {
-- 
cgit