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/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;