Use AC_STRERROR_R

[openldap] / servers / slapd / attr.c

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index 2a6b5f180e6a5b8bec29205d293cb2908fac3fda..c1bc60faff618a9ec432ea391173edef77eb2f7a 100644 (file)
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Copyright 1998-2004 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -142,8 +142,8 @@ attr_merge(
        Entry           *e,
        AttributeDescription *desc,
        BerVarray       vals,
-       BerVarray       nvals
-) {
+       BerVarray       nvals )
+{
        int rc;
 
        Attribute       **a;
@@ -176,8 +176,8 @@ attr_merge_normalize(
        Entry           *e,
        AttributeDescription *desc,
        BerVarray       vals,
-       void     *memctx
-) {
+       void     *memctx )
+{
        BerVarray       nvals = NULL;
        int             rc;
 
@@ -188,7 +188,7 @@ attr_merge_normalize(
                
                for ( i = 0; vals[i].bv_val; i++ );
 
-               nvals = sl_calloc( sizeof(struct berval), i + 1, memctx );
+               nvals = slap_sl_calloc( sizeof(struct berval), i + 1, memctx );
                for ( i = 0; vals[i].bv_val; i++ ) {
                        rc = (*desc->ad_type->sat_equality->smr_normalize)(
                                        SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
@@ -218,8 +218,8 @@ attr_merge_one(
        Entry           *e,
        AttributeDescription *desc,
        struct berval   *val,
-       struct berval   *nval
-) {
+       struct berval   *nval )
+{
        int rc;
        Attribute       **a;
 
@@ -250,8 +250,8 @@ attr_merge_normalize_one(
        Entry           *e,
        AttributeDescription *desc,
        struct berval   *val,
-       void            *memctx
-) {
+       void            *memctx )
+{
        struct berval   nval;
        struct berval   *nvalp;
        int             rc;
@@ -275,7 +275,7 @@ attr_merge_normalize_one(
 
        rc = attr_merge_one( e, desc, val, nvalp );
        if ( nvalp != NULL ) {
-               sl_free( nval.bv_val, memctx );
+               slap_sl_free( nval.bv_val, memctx );
        }
        return rc;
 }
@@ -288,8 +288,7 @@ attr_merge_normalize_one(
 Attribute *
 attrs_find(
     Attribute  *a,
-       AttributeDescription *desc
-)
+       AttributeDescription *desc )
 {
        for ( ; a != NULL; a = a->a_next ) {
                if ( is_ad_subtype( a->a_desc, desc ) ) {
@@ -307,8 +306,7 @@ attrs_find(
 Attribute *
 attr_find(
     Attribute  *a,
-       AttributeDescription *desc
-)
+       AttributeDescription *desc )
 {
        for ( ; a != NULL; a = a->a_next ) {
                if ( ad_cmp( a->a_desc, desc ) == 0 ) {
@@ -329,8 +327,7 @@ attr_find(
 int
 attr_delete(
     Attribute  **attrs,
-       AttributeDescription *desc
-)
+       AttributeDescription *desc )
 {
        Attribute       **a;