Cleanup ISO C compatibility for recent commits

diff --git a/libraries/liblber/debug.c b/libraries/liblber/debug.c
index cc38e85b44919e4b08d40e4ead4b3ff153caab4a..7a1b29953f6a609f41efa6cb9767f5ac30595317 100644 (file)
--- a/libraries/liblber/debug.c
+++ b/libraries/liblber/debug.c
@@ -62,7 +62,7 @@ void (lutil_debug)( int debug, int level, const char *fmt, ... )
        }
 #endif
 
-       sprintf(buffer, "%08x ", time(0L));
+       sprintf(buffer, "%08x ", (unsigned) time(0L));
        va_start( vl, fmt );
        vsnprintf( buffer+9, sizeof(buffer)-9, fmt, vl );
        buffer[sizeof(buffer)-1] = '\0';

diff --git a/servers/slapd/back-mdb/bind.c b/servers/slapd/back-mdb/bind.c
index b828406ca9849c60b45cc5b8d16a8034892b42a6..9a00b99848d6f9b76bd07b0a8b65d8d90bf0e4ac 100644 (file)
--- a/servers/slapd/back-mdb/bind.c
+++ b/servers/slapd/back-mdb/bind.c
@@ -32,7 +32,7 @@ mdb_bind( Operation *op, SlapReply *rs )
        AttributeDescription *password = slap_schema.si_ad_userPassword;
 
        MDB_txn         *rtxn;
-       mdb_op_info     opinfo = {0}, *moi = &opinfo;
+       mdb_op_info     opinfo = {{{0}}}, *moi = &opinfo;
 
        Debug( LDAP_DEBUG_ARGS,
                "==> " LDAP_XSTRING(mdb_bind) ": dn: %s\n",

diff --git a/servers/slapd/back-mdb/compare.c b/servers/slapd/back-mdb/compare.c
index c5c45d256b710f7dd56b4d3b7eca4f1fd38a5e9e..9ed7f9bde5fcad38655be3531f1a993b266ac821 100644 (file)
--- a/servers/slapd/back-mdb/compare.c
+++ b/servers/slapd/back-mdb/compare.c
@@ -29,7 +29,7 @@ mdb_compare( Operation *op, SlapReply *rs )
        int             manageDSAit = get_manageDSAit( op );
 
        MDB_txn         *rtxn;
-       mdb_op_info     opinfo = {0}, *moi = &opinfo;
+       mdb_op_info     opinfo = {{{0}}}, *moi = &opinfo;
 
        rs->sr_err = mdb_opinfo_get(op, mdb, 1, &moi);
        switch(rs->sr_err) {

diff --git a/servers/slapd/back-mdb/config.c b/servers/slapd/back-mdb/config.c
index b21dbee35e95cc54ed5f675444ab0454e89f621f..8e9df9a03927729548ed7cda231fd51d4fd22bc7 100644 (file)
--- a/servers/slapd/back-mdb/config.c
+++ b/servers/slapd/back-mdb/config.c
@@ -38,7 +38,7 @@ enum {
        MDB_MAXREADERS,
        MDB_MAXSIZE,
        MDB_MODE,
-       MDB_SSTACK,
+       MDB_SSTACK
 };
 
 static ConfigTable mdbcfg[] = {

diff --git a/servers/slapd/back-mdb/operational.c b/servers/slapd/back-mdb/operational.c
index 28f6e7b4aa2dec68acdf84d5e8a1f54a28f5ecf7..56df5a750afbdf1fa6f0e8faaab0d00a6087c611 100644 (file)
--- a/servers/slapd/back-mdb/operational.c
+++ b/servers/slapd/back-mdb/operational.c
@@ -36,7 +36,7 @@ mdb_hasSubordinates(
 {
        struct mdb_info *mdb = (struct mdb_info *) op->o_bd->be_private;
        MDB_txn         *rtxn;
-       mdb_op_info     opinfo = {0}, *moi = &opinfo;
+       mdb_op_info     opinfo = {{{0}}}, *moi = &opinfo;
        int             rc;
        
        assert( e != NULL );

diff --git a/servers/slapd/back-mdb/search.c b/servers/slapd/back-mdb/search.c
index a0ea03f063c6581801c0c5be3680470352012df3..5bac5501c99f247b5062ffeea5aa639cf73c2997 100644 (file)
--- a/servers/slapd/back-mdb/search.c
+++ b/servers/slapd/back-mdb/search.c
@@ -294,7 +294,7 @@ mdb_search( Operation *op, SlapReply *rs )
        IdScopes        isc;
        MDB_cursor      *mci;
 
-       mdb_op_info     opinfo = {0}, *moi = &opinfo;
+       mdb_op_info     opinfo = {{{0}}}, *moi = &opinfo;
        MDB_txn                 *ltid = NULL;
 
        Debug( LDAP_DEBUG_TRACE, "=> " LDAP_XSTRING(mdb_search) "\n", 0, 0, 0);

diff --git a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
index 6875b19fa7a62a1cbc0ab2244e1cbd58083c947d..d27dcb7a0a7e176279f2e84aef65f980d8aec045 100644 (file)
--- a/servers/slapd/overlays/pcache.c
+++ b/servers/slapd/overlays/pcache.c
@@ -2908,9 +2908,9 @@ pcache_op_bind(
 
        /* OK, just bind locally */
        if ( bi.bi_flags & BI_HASHED ) {
+               int delete = 0;
                BackendDB *be = op->o_bd;
                op->o_bd = &cm->db;
-               int delete = 0;
 
                Debug( pcache_debug, "pcache_op_bind: CACHED BIND for %s\n",
                        op->o_req_dn.bv_val, 0, 0 );

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 204f064e97b4540a896794f7c6ed1ee74ddfd07b..0c4bb5b9787cb3b075e79e6d5dace216cc25810a 100644 (file)
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -2077,8 +2077,12 @@ syncrepl_op_modify( Operation *op, SlapReply *rs )
                Modifications *ml;
                int size, rc;
                SlapReply rs1 = {0};
-               resolve_ctxt rx = { si, newlist };
-               slap_callback cb = { NULL, syncrepl_resolve_cb, NULL, &rx };
+               resolve_ctxt rx;
+               slap_callback cb = { NULL, syncrepl_resolve_cb, NULL, NULL };
+
+               rx.rx_si = si;
+               rx.rx_mods = newlist;
+               cb.sc_private = ℞
 
                op2.o_tag = LDAP_REQ_SEARCH;
                op2.ors_scope = LDAP_SCOPE_SUBTREE;