From: Pierangelo Masarati <ando@openldap.org>
Date: Sat, 17 Apr 2004 15:01:13 +0000 (+0000)
Subject: remove unused structure member ps_id
X-Git-Tag: OPENDLAP_REL_ENG_2_2_MP~491
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7be90a7ddf8543da25ae464a902494a5a36c0be5;p=openldap

remove unused structure member ps_id
---

diff --git a/servers/slapd/back-bdb/search.c b/servers/slapd/back-bdb/search.c
index cb060ac584..8c8933bd90 100644
--- a/servers/slapd/back-bdb/search.c
+++ b/servers/slapd/back-bdb/search.c
@@ -752,7 +752,7 @@ dn2entry_retry:
 	}
 
 	if ( get_pagedresults(sop) ) {
-		if ( sop->o_pagedresults_state.ps_cookie == 0 ) {
+		if ( (ID)( sop->o_pagedresults_state.ps_cookie ) == 0 ) {
 			id = bdb_idl_first( candidates, &cursor );
 
 		} else {
diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c
index d60c337750..8840f35ad1 100644
--- a/servers/slapd/controls.c
+++ b/servers/slapd/controls.c
@@ -901,7 +901,6 @@ static int parsePagedResults (
 	} else {
 		/* Initial request.  Initialize state. */
 		op->o_pagedresults_state.ps_cookie = 0;
-		op->o_pagedresults_state.ps_id = NOID;
 		op->o_pagedresults_state.ps_count = 0;
 	}
 
diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index b580224958..2203393f0a 100644
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -1893,7 +1893,6 @@ typedef unsigned long PagedResultsCookie;
 typedef struct slap_paged_state {
 	Backend *ps_be;
 	PagedResultsCookie ps_cookie;
-	ID ps_id;
 	int ps_count;
 } PagedResultsState;