Commit ef7f5f5e authored by Hallvard Furuseth's avatar Hallvard Furuseth
Browse files

Cleanup ISO C compatibility for recent commits

parent 79f4f3c0
......@@ -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';
......
......@@ -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",
......
......@@ -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) {
......
......@@ -38,7 +38,7 @@ enum {
MDB_MAXREADERS,
MDB_MAXSIZE,
MDB_MODE,
MDB_SSTACK,
MDB_SSTACK
};
static ConfigTable mdbcfg[] = {
......
......@@ -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 );
......
......@@ -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);
......
......@@ -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 );
......
......@@ -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;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment