Cleanup ISO C compatibility for recent commits

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