update for new backend types

[openldap] / servers / slapd / cr.c

diff --git a/servers/slapd/cr.c b/servers/slapd/cr.c
index a1c6005e93f2fef14d25a0f4b24d5e411f2d9302..107f2dba83c150247ae7a7e81798e181807750e3 100644 (file)
--- a/servers/slapd/cr.c
+++ b/servers/slapd/cr.c
@@ -127,8 +127,8 @@ cr_insert(
                cir->cir_name.bv_len = strlen( scr->scr_oid );
                cir->cir_cr = scr;
 
-               assert( cir->cir_name.bv_val );
-               assert( cir->cir_cr );
+               assert( cir->cir_name.bv_val != NULL );
+               assert( cir->cir_cr != NULL );
 
                if ( avl_insert( &cr_index, (caddr_t) cir,
                                 cr_index_cmp, avl_dup_error ) )
@@ -150,8 +150,8 @@ cr_insert(
                        cir->cir_name.bv_len = strlen( *names );
                        cir->cir_cr = scr;
 
-                       assert( cir->cir_name.bv_val );
-                       assert( cir->cir_cr );
+                       assert( cir->cir_name.bv_val != NULL );
+                       assert( cir->cir_cr != NULL );
 
                        if ( avl_insert( &cr_index, (caddr_t) cir,
                                         cr_index_cmp, avl_dup_error ) )
@@ -412,7 +412,7 @@ cr_unparse( BerVarray *res, ContentRule *start, ContentRule *end, int sys )
        ContentRule *cr;
        int i, num;
        struct berval bv, *bva = NULL, idx;
-       char ibuf[32], *ptr;
+       char ibuf[32];
 
        if ( !start )
                start = LDAP_STAILQ_FIRST( &cr_list );