From: Hallvard Furuseth <hallvard@openldap.org>
Date: Mon, 23 Jul 2007 22:08:32 +0000 (+0000)
Subject: Remove lint: import ITS#5035 part 2 from HEAD, remove unused variables.
X-Git-Tag: OPENLDAP_REL_ENG_2_3_38~31
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f06e69dd130ffec77d106dd96453d0b8548264f0;p=openldap

Remove lint: import ITS#5035 part 2 from HEAD, remove unused variables.
---

diff --git a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
index 8fa9449c21..1a71cea0c8 100644
--- a/servers/slapd/overlays/pcache.c
+++ b/servers/slapd/overlays/pcache.c
@@ -417,7 +417,6 @@ strings_containment(struct berval* stored, struct berval* incoming)
 static int
 substr_containment_substr(Operation *op, Filter* stored, Filter* incoming)
 {
-	int i;
 	int rc = 0;
 
 	struct berval init_incoming;
@@ -608,7 +607,6 @@ static void
 free_query (CachedQuery* qc)
 {
 	Query* q = (Query*)qc;
-	int i;
 
 	free(qc->q_uuid.bv_val);
 	filter_free(q->filter);
@@ -1035,6 +1033,7 @@ pcache_op_cleanup( Operation *op, SlapReply *rs ) {
 	}
 	op->o_callback = op->o_callback->sc_next;
 	op->o_tmpfree( cb, op->o_tmpmemctx );
+	return SLAP_CB_CONTINUE;
 }
 
 static int
@@ -1216,8 +1215,6 @@ pcache_op_search(
 	cache_manager *cm = on->on_bi.bi_private;
 	query_manager*		qm = cm->qm;
 
-	int count;
-
 	int i = -1;
 
 	AttributeName	*filter_attrs = NULL;
@@ -1230,7 +1227,6 @@ pcache_op_search(
 	int 		cacheable = 0;
 	int		fattr_cnt=0;
 	int		fattr_got_oc = 0;
-	int		oc_attr_absent = 1;
 
 	struct berval tempstr;
 
@@ -2025,7 +2021,7 @@ pcache_db_close(
 	slap_overinst *on = (slap_overinst *)be->bd_info;
 	cache_manager *cm = on->on_bi.bi_private;
 	query_manager *qm = cm->qm;
-	int i, j, rc = 0;
+	int i, rc = 0;
 
 	/* cleanup stuff inherited from the original database... */
 	cm->db.be_limits = NULL;