From: Howard Chu <hyc@openldap.org>
Date: Fri, 24 Oct 2003 08:10:16 +0000 (+0000)
Subject: Drop unused arguments from syncrepl_add_glue
X-Git-Tag: OPENLDAP_REL_ENG_2_1_MP~487
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=645c2bcb020bd09f23d7189de04ce5e6d4222ef5;p=openldap

Drop unused arguments from syncrepl_add_glue
---

diff --git a/servers/slapd/back-meta/cache-merge.c b/servers/slapd/back-meta/cache-merge.c
index e6472730ef..38df26fec3 100644
--- a/servers/slapd/back-meta/cache-merge.c
+++ b/servers/slapd/back-meta/cache-merge.c
@@ -183,8 +183,7 @@ merge_entry(
 			result->rc = info.added;
 		} else if ( rc == LDAP_REFERRAL ||
 					rc == LDAP_NO_SUCH_OBJECT ) {
-			slap_entry2mods( e, &modlist, &text );
-			syncrepl_add_glue( NULL, NULL, &op_tmp, e, modlist, 0, NULL, NULL );
+			syncrepl_add_glue( &op_tmp, e );
 			result->rc = info.added;
 		} else {
 			result->rc = 0;
diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 5e9184c230..0411298111 100644
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -1191,9 +1191,8 @@ LDAP_SLAPD_F (int) syncrepl_entry LDAP_P((
 LDAP_SLAPD_F (void) syncrepl_updateCookie LDAP_P((
 					syncinfo_t *, LDAP *, Operation *, struct berval *,
 					struct berval * ));
-LDAP_SLAPD_F (void)  syncrepl_add_glue LDAP_P(( syncinfo_t *, LDAP *,
-					Operation*, Entry*, Modifications*, int,
-					struct berval*, struct berval* ));
+LDAP_SLAPD_F (void)  syncrepl_add_glue LDAP_P(( 
+					Operation*, Entry* ));
 LDAP_SLAPD_F (Entry*) slap_create_syncrepl_entry LDAP_P((
 					Backend *, struct berval *,
 					struct berval *, struct berval * ));
diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 9501ef1b99..79d99e40a7 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -959,9 +959,7 @@ syncrepl_entry(
 					ret = 1;
 					goto done;
 				} else if ( rc == LDAP_REFERRAL || rc == LDAP_NO_SUCH_OBJECT ) {
-					syncrepl_add_glue( si, ld, op, e,
-						modlist, syncstate,
-						syncUUID, syncCookie);
+					syncrepl_add_glue( op, e );
 					si->si_e = NULL;
 					ret = 0;
 					goto done;
@@ -1098,14 +1096,8 @@ static struct berval gcbva[] = {
 
 void
 syncrepl_add_glue(
-	syncinfo_t *si,
-	LDAP *ld,
 	Operation* op,
-	Entry *e,
-	Modifications* modlist,
-	int syncstate,
-	struct berval* syncUUID,
-	struct berval* syncCookie
+	Entry *e
 )
 {
 	Backend *be = op->o_bd;
@@ -1123,7 +1115,7 @@ syncrepl_add_glue(
 	op->o_tag = LDAP_REQ_ADD;
 	op->o_callback = &cb;
 	cb.sc_response = null_callback;
-	cb.sc_private = si;
+	cb.sc_private = NULL;
 
 	dn = e->e_name;
 	ndn = e->e_nname;