From cc973cbd7776ba03a08047ca7e6bef7700bbf37d Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 22 Aug 2006 18:09:49 +0000
Subject: r17711: fix compiler warnings

metze
(This used to be commit f3dc51fef53287cc2e2af7ed4a9f3f52a5cd06ed)
---
 source4/lib/ldb/ldb_tdb/ldb_index.c | 16 ++++++++--------
 source4/lib/ldb/ldb_tdb/ldb_tdb.c   |  1 -
 source4/lib/ldb/ldb_tdb/ldb_tdb.h   |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'source4/lib/ldb')

diff --git a/source4/lib/ldb/ldb_tdb/ldb_index.c b/source4/lib/ldb/ldb_tdb/ldb_index.c
index 7b67db33d3..c6feeaeb42 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_index.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_index.c
@@ -180,7 +180,7 @@ static int list_cmp(const char **s1, const char **s2)
   return a list of dn's that might match a simple indexed search or
  */
 static int ltdb_index_dn_simple(struct ldb_module *module, 
-				struct ldb_parse_tree *tree,
+				const struct ldb_parse_tree *tree,
 				const struct ldb_message *index_list,
 				struct dn_list *list)
 {
@@ -256,7 +256,7 @@ static int list_union(struct ldb_context *, struct dn_list *, const struct dn_li
   the special objectclass attribute
  */
 static int ltdb_index_dn_objectclass(struct ldb_module *module, 
-				     struct ldb_parse_tree *tree,
+				     const struct ldb_parse_tree *tree,
 				     const struct ldb_message *index_list,
 				     struct dn_list *list)
 {
@@ -316,7 +316,7 @@ static int ltdb_index_dn_objectclass(struct ldb_module *module,
   return a list of dn's that might match a leaf indexed search
  */
 static int ltdb_index_dn_leaf(struct ldb_module *module, 
-			      struct ldb_parse_tree *tree,
+			      const struct ldb_parse_tree *tree,
 			      const struct ldb_message *index_list,
 			      struct dn_list *list)
 {
@@ -430,7 +430,7 @@ static int list_union(struct ldb_context *ldb,
 }
 
 static int ltdb_index_dn(struct ldb_module *module, 
-			 struct ldb_parse_tree *tree,
+			 const struct ldb_parse_tree *tree,
 			 const struct ldb_message *index_list,
 			 struct dn_list *list);
 
@@ -439,7 +439,7 @@ static int ltdb_index_dn(struct ldb_module *module,
   OR two index results
  */
 static int ltdb_index_dn_or(struct ldb_module *module, 
-			    struct ldb_parse_tree *tree,
+			    const struct ldb_parse_tree *tree,
 			    const struct ldb_message *index_list,
 			    struct dn_list *list)
 {
@@ -504,7 +504,7 @@ static int ltdb_index_dn_or(struct ldb_module *module,
   NOT an index results
  */
 static int ltdb_index_dn_not(struct ldb_module *module, 
-			     struct ldb_parse_tree *tree,
+			     const struct ldb_parse_tree *tree,
 			     const struct ldb_message *index_list,
 			     struct dn_list *list)
 {
@@ -523,7 +523,7 @@ static int ltdb_index_dn_not(struct ldb_module *module,
   AND two index results
  */
 static int ltdb_index_dn_and(struct ldb_module *module, 
-			     struct ldb_parse_tree *tree,
+			     const struct ldb_parse_tree *tree,
 			     const struct ldb_message *index_list,
 			     struct dn_list *list)
 {
@@ -586,7 +586,7 @@ static int ltdb_index_dn_and(struct ldb_module *module,
   -1 if an error. return 0 for no matches, or 1 for matches
  */
 static int ltdb_index_dn(struct ldb_module *module, 
-			 struct ldb_parse_tree *tree,
+			 const struct ldb_parse_tree *tree,
 			 const struct ldb_message *index_list,
 			 struct dn_list *list)
 {
diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.c b/source4/lib/ldb/ldb_tdb/ldb_tdb.c
index 97b03a9410..5a19dd96fc 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_tdb.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_tdb.c
@@ -255,7 +255,6 @@ done:
 
 static int ltdb_add_internal(struct ldb_module *module, const struct ldb_message *msg)
 {
-	char *err;
 	int ret;
 	
 	ret = ltdb_check_special_dn(module, msg);
diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.h b/source4/lib/ldb/ldb_tdb/ldb_tdb.h
index 7c6c5dfdb0..fb28d00847 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_tdb.h
+++ b/source4/lib/ldb/ldb_tdb/ldb_tdb.h
@@ -37,7 +37,7 @@ struct ltdb_context {
 	struct ldb_module *module;
 
 	/* search stuff */
-	struct ldb_parse_tree *tree;
+	const struct ldb_parse_tree *tree;
 	const struct ldb_dn *base;
 	enum ldb_scope scope;
 	const char * const *attrs;
-- 
cgit