misc cleanup

diff --git a/servers/slapd/ctxcsn.c b/servers/slapd/ctxcsn.c
index 3de82dcff89637f0c50efb43ecd74a479257aae2..8ebb54574694ce629fc1044236b8e1b497ec0392 100644 (file)
--- a/servers/slapd/ctxcsn.c
+++ b/servers/slapd/ctxcsn.c
@@ -157,31 +157,21 @@ slap_create_context_csn_entry(
        ber_str2bv( "subentry", strlen("subentry"), 1, &ocbva[1] );
        ber_str2bv( "syncProviderSubentry",
                        strlen("syncProviderSubentry"), 1, &ocbva[2] );
-       ocbva[3].bv_len = 0;
-       ocbva[3].bv_val = NULL;
 
-       mod = (Modifications *) ch_malloc( sizeof( Modifications ));
+       mod = (Modifications *) ch_calloc( 1, sizeof( Modifications ));
        mod->sml_op = LDAP_MOD_REPLACE;
-       mod->sml_next = NULL;
-       mod->sml_desc = NULL;
        ber_str2bv( "objectClass", strlen("objectClass"), 1, &mod->sml_type );
        mod->sml_bvalues = ocbva;
-       mod->sml_nvalues = NULL;
        *modtail = mod;
        modtail = &mod->sml_next;
 
        ber_str2bv( "syncProviderSubentry",
                        strlen("syncProviderSubentry"), 1, &socbva[0] );
-       socbva[1].bv_len = 0;
-       socbva[1].bv_val = NULL;
 
-       mod = (Modifications *) ch_malloc( sizeof( Modifications ));
+       mod = (Modifications *) ch_calloc( 1, sizeof( Modifications ));
        mod->sml_op = LDAP_MOD_REPLACE;
-       mod->sml_next = NULL;
-       mod->sml_desc = NULL;
        ber_str2bv( "structuralObjectClass", strlen("structuralObjectClass"), 1, &mod->sml_type );
        mod->sml_bvalues = socbva;
-       mod->sml_nvalues = NULL;
        *modtail = mod;
        modtail = &mod->sml_next;
 
@@ -189,44 +179,29 @@ slap_create_context_csn_entry(
        sprintf( rdnstr, "cn=%s", substr );
        ber_str2bv( substr, strlen( substr ), 1, &cnbva[0] );
        ber_str2bv( rdnstr, strlen( rdnstr ), 1, &psubrdn );
-       cnbva[1].bv_len = 0;
-       cnbva[1].bv_val = NULL;
-       mod = (Modifications *) ch_malloc( sizeof( Modifications ));
+       mod = (Modifications *) ch_calloc( 1, sizeof( Modifications ));
        mod->sml_op = LDAP_MOD_REPLACE;
-       mod->sml_next = NULL;
-       mod->sml_desc = NULL;
        ber_str2bv( "cn", strlen("cn"), 1, &mod->sml_type );
        mod->sml_bvalues = cnbva;
-       mod->sml_nvalues = NULL;
        *modtail = mod;
        modtail = &mod->sml_next;
 
        if ( context_csn ) {
                ber_dupbv( &scbva[0], context_csn );
-               scbva[1].bv_len = 0;
-               scbva[1].bv_val = NULL;
-               mod = (Modifications *) ch_malloc( sizeof( Modifications ));
+               mod = (Modifications *) ch_calloc( 1, sizeof( Modifications ));
                mod->sml_op = LDAP_MOD_REPLACE;
-               mod->sml_next = NULL;
-               mod->sml_desc = NULL;
                ber_str2bv( "contextCSN", strlen("contextCSN"), 1, &mod->sml_type );
                mod->sml_bvalues = scbva;
-               mod->sml_nvalues = NULL;
                *modtail = mod;
                modtail = &mod->sml_next;
        }
 
        ber_str2bv( "{}", strlen("{}"), 1, &ssbva[0] );
-       ssbva[1].bv_len = 0;
-       ssbva[1].bv_val = NULL;
-       mod = (Modifications *) ch_malloc( sizeof( Modifications ));
+       mod = (Modifications *) ch_calloc( 1, sizeof( Modifications ));
        mod->sml_op = LDAP_MOD_REPLACE;
-       mod->sml_next = NULL;
-       mod->sml_desc = NULL;
        ber_str2bv( "subtreeSpecification",
                        strlen("subtreeSpecification"), 1, &mod->sml_type );
        mod->sml_bvalues = ssbva;
-       mod->sml_nvalues = NULL;
        *modtail = mod;
        modtail = &mod->sml_next;
 
@@ -288,7 +263,7 @@ slap_contextcsn_callback(
 int
 slap_get_csn(
        Operation *op,
-       const char *csnbuf,
+       char *csnbuf,
        int     len,
        struct berval *csn,
        int manage_ctxcsn

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 9af2191271126f98adf90d01ff7a9f17887bf106..4118782c21394b52c692e84017e4b14f379f8b4a 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -362,7 +362,7 @@ LDAP_SLAPD_F (struct berval *) slap_get_commit_csn LDAP_P(( Operation * ));
 LDAP_SLAPD_F (void) slap_rewind_commit_csn LDAP_P(( Operation * ));
 LDAP_SLAPD_F (void) slap_graduate_commit_csn LDAP_P(( Operation * ));
 LDAP_SLAPD_F (Entry *) slap_create_context_csn_entry LDAP_P(( Backend *, struct berval *));
-LDAP_SLAPD_F (int) slap_get_csn LDAP_P(( Operation *, const char *, int, struct berval *, int ));
+LDAP_SLAPD_F (int) slap_get_csn LDAP_P(( Operation *, char *, int, struct berval *, int ));
 
 /*
  * daemon.c

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index c7743996cc76cdc7c83f4f898b308f94064858ca..69cb4b7c9431fbb070d11eeb53c5d14994b8cf2a 100644 (file)
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -1297,16 +1297,10 @@ syncrepl_updateCookie(
        ber_str2bv( "subentry", strlen("subentry"), 1, &ocbva[1] );
        ber_str2bv( "syncConsumerSubentry",
                        strlen("syncConsumerSubentry"), 1, &ocbva[2] );
-       ocbva[3].bv_len = 0;
-       ocbva[3].bv_val = NULL;
-
-       mod = (Modifications *) ch_malloc( sizeof( Modifications ));
+       mod = (Modifications *) ch_calloc( 1, sizeof( Modifications ));
        mod->sml_op = LDAP_MOD_REPLACE;
-       mod->sml_next = NULL;
-       mod->sml_desc = NULL;
        ber_str2bv( "objectClass", strlen("objectClass"), 1, &mod->sml_type );
        mod->sml_bvalues = ocbva;
-       mod->sml_nvalues = NULL;
        *modtail = mod;
        modtail = &mod->sml_next;
 
@@ -1314,43 +1308,28 @@ syncrepl_updateCookie(
        sprintf( rdnstr, "cn=%s", substr );
        ber_str2bv( substr, strlen( substr ), 1, &cnbva[0] );
        ber_str2bv( rdnstr, strlen( rdnstr ), 1, &psubrdn );
-       cnbva[1].bv_len = 0;
-       cnbva[1].bv_val = NULL;
-       mod = (Modifications *) ch_malloc( sizeof( Modifications ));
+       mod = (Modifications *) ch_calloc( 1, sizeof( Modifications ));
        mod->sml_op = LDAP_MOD_REPLACE;
-       mod->sml_next = NULL;
-       mod->sml_desc = NULL;
        ber_str2bv( "cn", strlen("cn"), 1, &mod->sml_type );
        mod->sml_bvalues = cnbva;
-       mod->sml_nvalues = NULL;
        *modtail = mod;
        modtail = &mod->sml_next;
 
        ber_dupbv( &scbva[0], si->syncCookie );
-       scbva[1].bv_len = 0;
-       scbva[1].bv_val = NULL;
-       mod = (Modifications *) ch_malloc( sizeof( Modifications ));
+       mod = (Modifications *) ch_calloc( 1, sizeof( Modifications ));
        mod->sml_op = LDAP_MOD_REPLACE;
-       mod->sml_next = NULL;
-       mod->sml_desc = NULL;
        ber_str2bv( "syncreplCookie", strlen("syncreplCookie"),
                                                1, &mod->sml_type );
        mod->sml_bvalues = scbva;
-       mod->sml_nvalues = NULL;
        *modtail = mod;
        modtail = &mod->sml_next;
 
        ber_str2bv( "{}", strlen("{}"), 1, &ssbva[0] );
-       ssbva[1].bv_len = 0;
-       ssbva[1].bv_val = NULL;
-       mod = (Modifications *) ch_malloc( sizeof( Modifications ));
+       mod = (Modifications *) ch_calloc( 1, sizeof( Modifications ));
        mod->sml_op = LDAP_MOD_REPLACE;
-       mod->sml_next = NULL;
-       mod->sml_desc = NULL;
        ber_str2bv( "subtreeSpecification",
                        strlen("subtreeSpecification"), 1, &mod->sml_type );
        mod->sml_bvalues = ssbva;
-       mod->sml_nvalues = NULL;
        *modtail = mod;
        modtail = &mod->sml_next;