ITS#5747: Only use C99 flexible array member when supported

[openldap] / servers / slapd / overlays / pcache.c

diff --git a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
index 40ac4b99eda15cf777c7af3ff817b039da75a909..5ecfc3fb5efc46d2697d115a2109952a5440c6a8 100644 (file)
--- a/servers/slapd/overlays/pcache.c
+++ b/servers/slapd/overlays/pcache.c
@@ -1697,7 +1697,7 @@ pcache_remove_entries_from_cache(
        Filter          f = { 0 };
        char            filtbuf[ LDAP_LUTIL_UUIDSTR_BUFSIZE + STRLENOF( "(entryUUID=)" ) ];
        AttributeAssertion ava = ATTRIBUTEASSERTION_INIT;
-       AttributeName   attrs[ 2 ] = { 0 };
+       AttributeName   attrs[ 2 ] = {{{ 0 }}};
        int             s, rc;
 
        if ( op == NULL ) {
@@ -1812,7 +1812,7 @@ pcache_remove_entry_queries_from_cache(
        Filter                  f = { 0 };
        char                    filter_str[ LDAP_LUTIL_UUIDSTR_BUFSIZE + STRLENOF( "(queryId=)" ) ];
        AttributeAssertion      ava = ATTRIBUTEASSERTION_INIT;
-       AttributeName           attrs[ 2 ] = { 0 };
+       AttributeName           attrs[ 2 ] = {{{ 0 }}};
        int                     rc;
 
        BerVarray               vals = NULL;
@@ -2712,7 +2712,7 @@ pc_cfadd( Operation *op, SlapReply *rs, Entry *p, ConfigArgs *ca )
        /* FIXME: should not hardcode "olcDatabase" here */
        bv.bv_len = snprintf( ca->cr_msg, sizeof( ca->cr_msg ),
                "olcDatabase=%s", cm->db.bd_info->bi_type );
-       if ( bv.bv_len < 0 || bv.bv_len >= sizeof( ca->cr_msg ) ) {
+       if ( bv.bv_len >= sizeof( ca->cr_msg ) ) {
                return -1;
        }
        bv.bv_val = ca->cr_msg;
@@ -3258,7 +3258,7 @@ pcache_db_open2(
                        BerVarray       vals = NULL;
                        Filter          f = { 0 }, f2 = { 0 };
                        AttributeAssertion      ava = ATTRIBUTEASSERTION_INIT;
-                       AttributeName   attrs[ 2 ] = { 0 };
+                       AttributeName   attrs[ 2 ] = {{{ 0 }}};
 
                        connection_fake_init( &conn, &opbuf, thrctx );
                        op = &opbuf.ob_op;
@@ -3424,7 +3424,7 @@ pcache_db_close(
                slap_callback   cb = { 0 };
 
                SlapReply       rs = { REP_RESULT };
-               Modifications   mod = { 0 };
+               Modifications   mod = {{ 0 }};
 
                thrctx = ldap_pvt_thread_pool_context();