From 18aac0e55ec2fd438a7ded5bfd99f727c3d5bd9c Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Thu, 14 Sep 2006 00:14:27 +0000 Subject: [PATCH] Cleanup prev commit --- servers/slapd/at.c | 4 +--- servers/slapd/oc.c | 4 +--- servers/slapd/proto-slap.h | 6 ++++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/servers/slapd/at.c b/servers/slapd/at.c index 2f5c57d700..7ab6eed84f 100644 --- 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 bbf7be86a3..a483922aa3 100644 --- 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 ccf21d146a..6728c96907 100644 --- 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 )); -- 2.39.5