cleanup

[openldap] / servers / slapd / ctxcsn.c

diff --git a/servers/slapd/ctxcsn.c b/servers/slapd/ctxcsn.c
index 0fe59b9f00b48e34d85091f5e83f86057d652915..53ed6a0ae1898396e34a5548ec727e833510a077 100644 (file)
--- a/servers/slapd/ctxcsn.c
+++ b/servers/slapd/ctxcsn.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2003 The OpenLDAP Foundation.
+ * Copyright 2003-2004 The OpenLDAP Foundation.
  * Portions Copyright 2003 IBM Corporation.
  * All rights reserved.
  *
@@ -33,7 +33,7 @@ const struct berval slap_ldapsync_cn_bv = BER_BVC("cn=ldapsync");
 void
 slap_get_commit_csn( Operation *op, struct berval *csn )
 {
-       struct slap_csn_entry *csne = NULL, *committed_csne = NULL;
+       struct slap_csn_entry *csne, *committed_csne = NULL;
        int i = 0;
 
        csn->bv_val = NULL;
@@ -42,51 +42,46 @@ slap_get_commit_csn( Operation *op, struct berval *csn )
        ldap_pvt_thread_mutex_lock( &op->o_bd->be_pcl_mutex );
 
        LDAP_TAILQ_FOREACH( csne, &op->o_bd->be_pending_csn_list, csn_link ) {
-               if ( csne->opid == op->o_opid && csne->connid == op->o_connid )
+               if ( csne->opid == op->o_opid && csne->connid == op->o_connid ) {
+                       csne->state = SLAP_CSN_COMMIT;
                        break;
-       }
-
-       if ( csne ) {
-               csne->state = SLAP_CSN_COMMIT;
+               }
        }
 
        LDAP_TAILQ_FOREACH( csne, &op->o_bd->be_pending_csn_list, csn_link ) {
-               if ( csne->state == SLAP_CSN_COMMIT )
-                       committed_csne = csne;
-               if ( csne->state == SLAP_CSN_PENDING )
-                       break;
+               if ( csne->state == SLAP_CSN_COMMIT ) committed_csne = csne;
+               if ( csne->state == SLAP_CSN_PENDING ) break;
        }
 
-       ldap_pvt_thread_mutex_unlock( &op->o_bd->be_pcl_mutex );
-
        if ( committed_csne ) {
                ber_dupbv( csn, committed_csne->csn );
        }
+
+       ldap_pvt_thread_mutex_unlock( &op->o_bd->be_pcl_mutex );
+
 }
 
 void
 slap_rewind_commit_csn( Operation *op )
 {
-       struct slap_csn_entry *csne = NULL;
+       struct slap_csn_entry *csne;
 
        ldap_pvt_thread_mutex_lock( &op->o_bd->be_pcl_mutex );
 
        LDAP_TAILQ_FOREACH( csne, &op->o_bd->be_pending_csn_list, csn_link ) {
-               if ( csne->opid == op->o_opid && csne->connid == op->o_connid )
+               if ( csne->opid == op->o_opid && csne->connid == op->o_connid ) {
+                       csne->state = SLAP_CSN_PENDING;
                        break;
+               }
        }
 
-       if ( csne ) {
-               csne->state = SLAP_CSN_PENDING;
-       }
-       
        ldap_pvt_thread_mutex_unlock( &op->o_bd->be_pcl_mutex );
 }
 
 void
 slap_graduate_commit_csn( Operation *op )
 {
-       struct slap_csn_entry *csne = NULL;
+       struct slap_csn_entry *csne;
 
        if ( op == NULL )
                return;
@@ -97,15 +92,13 @@ slap_graduate_commit_csn( Operation *op )
        ldap_pvt_thread_mutex_lock( &op->o_bd->be_pcl_mutex );
 
        LDAP_TAILQ_FOREACH( csne, &op->o_bd->be_pending_csn_list, csn_link ) {
-               if ( csne->opid == op->o_opid && csne->connid == op->o_connid )
+               if ( csne->opid == op->o_opid && csne->connid == op->o_connid ) {
+                       LDAP_TAILQ_REMOVE( &op->o_bd->be_pending_csn_list, csne, csn_link );
+                       ch_free( csne->csn->bv_val );
+                       ch_free( csne->csn );
+                       ch_free( csne );
                        break;
-       }
-
-       if ( csne ) {
-               LDAP_TAILQ_REMOVE( &op->o_bd->be_pending_csn_list, csne, csn_link );
-               ch_free( csne->csn->bv_val );
-               ch_free( csne->csn );
-               ch_free( csne );
+               }
        }
 
        ldap_pvt_thread_mutex_unlock( &op->o_bd->be_pcl_mutex );
@@ -131,13 +124,14 @@ slap_create_context_csn_entry(
 
        struct berval bv;
 
-       e = ( Entry * ) ch_calloc( 1, sizeof( Entry ));
-
-       attr_merge( e, slap_schema.si_ad_objectClass, ocbva, NULL );
-
-       attr_merge_one( e, slap_schema.si_ad_structuralObjectClass, &ocbva[1], NULL );
+       e = (Entry *) ch_calloc( 1, sizeof( Entry ));
 
-       attr_merge_one( e, slap_schema.si_ad_cn, (struct berval *)&slap_ldapsync_bv, NULL );
+       attr_merge( e, slap_schema.si_ad_objectClass,
+               ocbva, NULL );
+       attr_merge_one( e, slap_schema.si_ad_structuralObjectClass,
+               &ocbva[1], NULL );
+       attr_merge_one( e, slap_schema.si_ad_cn,
+               (struct berval *)&slap_ldapsync_bv, NULL );
 
        if ( context_csn ) {
                attr_merge_one( e, slap_schema.si_ad_contextCSN,
@@ -148,26 +142,13 @@ slap_create_context_csn_entry(
        bv.bv_len = sizeof("{}")-1;
        attr_merge_one( e, slap_schema.si_ad_subtreeSpecification, &bv, NULL );
 
-       build_new_dn( &e->e_name, &be->be_nsuffix[0], (struct berval *)&slap_ldapsync_cn_bv, NULL );
+       build_new_dn( &e->e_name, &be->be_nsuffix[0],
+               (struct berval *)&slap_ldapsync_cn_bv, NULL );
        ber_dupbv( &e->e_nname, &e->e_name );
 
        return e;
 }
 
-static int
-slap_contextcsn_callback(
-       Operation* op,
-       SlapReply* rs
-)
-{
-       if ( rs->sr_type != REP_SEARCH ) {
-               *((int*)op->o_callback->sc_private) = 0;
-       } else {
-               *((int*)op->o_callback->sc_private) = 1;
-       }
-       return LDAP_SUCCESS;
-}
-
 int
 slap_get_csn(
        Operation *op,
@@ -177,23 +158,24 @@ slap_get_csn(
        int manage_ctxcsn
 )
 {
-       struct  slap_csn_entry *pending;
+       struct slap_csn_entry *pending;
 
-       if ( csn == NULL )
-               return LDAP_OTHER;
+       if ( csn == NULL ) return LDAP_OTHER;
 
        csn->bv_len = lutil_csnstr( csnbuf, len, 0, 0 );
        csn->bv_val = csnbuf;
 
        if ( manage_ctxcsn ) {
-               pending = (struct slap_csn_entry *) ch_calloc( 1, sizeof( struct slap_csn_entry ));
+               pending = (struct slap_csn_entry *) ch_calloc( 1,
+                       sizeof( struct slap_csn_entry ));
                ldap_pvt_thread_mutex_lock( &op->o_bd->be_pcl_mutex );
                ber_dupbv( &op->o_sync_csn, csn );
                pending->csn = ber_dupbv( NULL, csn );
                pending->connid = op->o_connid;
                pending->opid = op->o_opid;
                pending->state = SLAP_CSN_PENDING;
-               LDAP_TAILQ_INSERT_TAIL( &op->o_bd->be_pending_csn_list, pending, csn_link );
+               LDAP_TAILQ_INSERT_TAIL( &op->o_bd->be_pending_csn_list,
+                       pending, csn_link );
                ldap_pvt_thread_mutex_unlock( &op->o_bd->be_pcl_mutex );
        }