Cleanup prev commit

diff --git a/servers/slapd/at.c b/servers/slapd/at.c
index 2f5c57d700c946e03a96d2d76ecf85c775c75dd5..7ab6eed84fd0cf7761791aaa84a301ffd44446e1 100644 (file)
--- a/servers/slapd/at.c
+++ b/servers/slapd/at.c
@@ -229,7 +229,7 @@ at_delete_names( AttributeType *at )
 /* Mark the attribute as deleted, remove from list, and remove all its
  * names from the AVL tree. Leave the OID in the tree.
  */
-int
+void
 at_delete( AttributeType *at )
 {
        at->sat_flags |= SLAP_AT_DELETED;
@@ -237,8 +237,6 @@ at_delete( AttributeType *at )
        LDAP_STAILQ_REMOVE(&attr_list,at,slap_attribute_type,sat_next);
 
        at_delete_names( at );
-
-       return 0;
 }
 
 static void

diff --git a/servers/slapd/oc.c b/servers/slapd/oc.c
index bbf7be86a357305f5bb315f2218a9870de36fc1e..a483922aa31b07010dd65ec5e30c1e30f7f7089c 100644 (file)
--- a/servers/slapd/oc.c
+++ b/servers/slapd/oc.c
@@ -407,7 +407,7 @@ oc_delete_names( ObjectClass *oc )
 /* Mark the ObjectClass as deleted, remove from list, and remove all its
  * names from the AVL tree. Leave the OID in the tree.
  */
-int
+void
 oc_delete( ObjectClass *oc )
 {
        oc->soc_flags |= SLAP_OC_DELETED;
@@ -415,8 +415,6 @@ oc_delete( ObjectClass *oc )
        LDAP_STAILQ_REMOVE(&oc_list,oc,slap_object_class,soc_next);
 
        oc_delete_names( oc );
-
-       return 0;
 }
 
 static void

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index ccf21d146a4f94d3de816be321f24f95a6b31f19..6728c9690789f3ff99f0198efadc7f2d551194e5 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -230,6 +230,7 @@ LDAP_SLAPD_F (int) is_at_syntax LDAP_P((
 
 LDAP_SLAPD_F (int) at_start LDAP_P(( AttributeType **at ));
 LDAP_SLAPD_F (int) at_next LDAP_P(( AttributeType **at ));
+LDAP_SLAPD_F (void) at_delete LDAP_P(( AttributeType *at ));
 
 LDAP_SLAPD_F (void) at_unparse LDAP_P((
        BerVarray *bva, AttributeType *start, AttributeType *end, int system ));
@@ -1240,8 +1241,9 @@ LDAP_SLAPD_F (int) is_entry_objectclass LDAP_P((
 
 LDAP_SLAPD_F (int) oc_schema_info( Entry *e );
 
-LDAP_SLAPD_F (int) oc_start LDAP_P(( ObjectClass **at ));
-LDAP_SLAPD_F (int) oc_next LDAP_P(( ObjectClass **at ));
+LDAP_SLAPD_F (int) oc_start LDAP_P(( ObjectClass **oc ));
+LDAP_SLAPD_F (int) oc_next LDAP_P(( ObjectClass **oc ));
+LDAP_SLAPD_F (void) oc_delete LDAP_P(( ObjectClass *oc ));
 
 LDAP_SLAPD_F (void) oc_unparse LDAP_P((
        BerVarray *bva, ObjectClass *start, ObjectClass *end, int system ));