cleanup bind

[openldap] / servers / slapd / sets.c

diff --git a/servers/slapd/sets.c b/servers/slapd/sets.c
index b223ca3250243a24672df9c8bddfaa4922e6f959..97b49b46308ad66abcba26d840f16d80f860e062 100644 (file)
--- a/servers/slapd/sets.c
+++ b/servers/slapd/sets.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 2000-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -20,14 +20,14 @@ static int set_samedn (char *dn1, char *dn2);
 long
 slap_set_size (BerVarray set)
 {
-       int i;
+       long    i;
 
        i = 0;
        if (set != NULL) {
                while (set[i].bv_val)
                        i++;
        }
-       return(i);
+       return i;
 }
 
 void
@@ -47,7 +47,7 @@ set_join (BerVarray lset, int op, BerVarray rset)
                if (lset == NULL || lset->bv_val == NULL) {
                        if (rset == NULL) {
                                if (lset == NULL)
-                                       return(ch_calloc(1, sizeof(struct berval)));
+                                       return(SLAP_CALLOC(1, sizeof(struct berval)));
                                return(lset);
                        }
                        slap_set_dispose(lset);
@@ -59,7 +59,7 @@ set_join (BerVarray lset, int op, BerVarray rset)
                }
 
                i = slap_set_size(lset) + slap_set_size(rset) + 1;
-               set = ch_calloc(i, sizeof(struct berval));
+               set = SLAP_CALLOC(i, sizeof(struct berval));
                if (set != NULL) {
                        /* set_chase() depends on this routine to
                         * keep the first elements of the result
@@ -87,7 +87,7 @@ set_join (BerVarray lset, int op, BerVarray rset)
 
        if (op == '&') {
                if (lset == NULL || lset->bv_val == NULL || rset == NULL || rset->bv_val == NULL) {
-                       set = ch_calloc(1, sizeof(struct berval));
+                       set = SLAP_CALLOC(1, sizeof(struct berval));
                } else {
                        set = lset;
                        lset = NULL;
@@ -119,11 +119,14 @@ set_chase (SLAP_SET_GATHER gatherer,
 {
        BerVarray vals, nset;
        char attrstr[32];
-       struct berval bv = {attr->bv_len, attrstr};
+       struct berval bv;
        int i;
 
+       bv.bv_len = attr->bv_len;
+       bv.bv_val = attrstr;
+
        if (set == NULL)
-               return(ch_calloc(1, sizeof(struct berval)));
+               return(SLAP_CALLOC(1, sizeof(struct berval)));
 
        if (set->bv_val == NULL)
                return(set);
@@ -135,7 +138,7 @@ set_chase (SLAP_SET_GATHER gatherer,
        AC_MEMCPY(attrstr, attr->bv_val, attr->bv_len);
        attrstr[attr->bv_len] = 0;
 
-       nset = ch_calloc(1, sizeof(struct berval));
+       nset = SLAP_CALLOC(1, sizeof(struct berval));
        if (nset == NULL) {
                slap_set_dispose(set);
                return(NULL);
@@ -284,10 +287,10 @@ slap_set_filter (SLAP_SET_GATHER gatherer,
                        if (c == 0)
                                SF_ERROR(syntax);
                        
-                       set = ch_calloc(2, sizeof(struct berval));
+                       set = SLAP_CALLOC(2, sizeof(struct berval));
                        if (set == NULL)
                                SF_ERROR(memory);
-                       set->bv_val = ch_calloc(len + 1, sizeof(char));
+                       set->bv_val = SLAP_CALLOC(len + 1, sizeof(char));
                        if (set->bv_val == NULL)
                                SF_ERROR(memory);
                        AC_MEMCPY(set->bv_val, &filter[-len - 1], len);
@@ -328,7 +331,7 @@ slap_set_filter (SLAP_SET_GATHER gatherer,
                        {
                                if ((SF_TOP() == (void *)'/') || IS_SET(SF_TOP()))
                                        SF_ERROR(syntax);
-                               set = ch_calloc(2, sizeof(struct berval));
+                               set = SLAP_CALLOC(2, sizeof(struct berval));
                                if (set == NULL)
                                        SF_ERROR(memory);
                                ber_dupbv( set, this );
@@ -339,7 +342,7 @@ slap_set_filter (SLAP_SET_GATHER gatherer,
                        {
                                if ((SF_TOP() == (void *)'/') || IS_SET(SF_TOP()))
                                        SF_ERROR(syntax);
-                               set = ch_calloc(2, sizeof(struct berval));
+                               set = SLAP_CALLOC(2, sizeof(struct berval));
                                if (set == NULL)
                                        SF_ERROR(memory);
                                ber_dupbv( set, user );
@@ -381,7 +384,7 @@ slap_set_filter (SLAP_SET_GATHER gatherer,
                SF_ERROR(syntax);
        }
 
-       rc = slap_set_size(set);
+       rc = slap_set_size(set) > 0 ? 1 : 0;
        if (results) {
                *results = set;
                set = NULL;