From 3a73af57c10313c2815a334c866e292116d0d2d8 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Sat, 22 Jul 2000 17:30:44 +0000 Subject: [PATCH] conform schema routines to ldap naming conventions --- servers/slapd/at.c | 4 ++-- servers/slapd/mr.c | 6 +++--- servers/slapd/oc.c | 4 ++-- servers/slapd/proto-slap.h | 10 +++++----- servers/slapd/schemaparse.c | 4 ++-- servers/slapd/slap.h | 8 ++++---- servers/slapd/syntax.c | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/servers/slapd/at.c b/servers/slapd/at.c index 4ad381d9ff..910889ad75 100644 --- a/servers/slapd/at.c +++ b/servers/slapd/at.c @@ -239,7 +239,7 @@ at_insert( int at_add( - LDAP_ATTRIBUTE_TYPE *at, + LDAPAttributeType *at, const char **err ) { @@ -258,7 +258,7 @@ at_add( return SLAP_SCHERR_ATTR_INCOMPLETE; } sat = (AttributeType *) ch_calloc( 1, sizeof(AttributeType) ); - memcpy( &sat->sat_atype, at, sizeof(LDAP_ATTRIBUTE_TYPE)); + memcpy( &sat->sat_atype, at, sizeof(LDAPAttributeType)); sat->sat_cname = cname; diff --git a/servers/slapd/mr.c b/servers/slapd/mr.c index 23c0f70bfb..f40535436a 100644 --- a/servers/slapd/mr.c +++ b/servers/slapd/mr.c @@ -109,7 +109,7 @@ mr_insert( int mr_add( - LDAP_MATCHING_RULE *mr, + LDAPMatchingRule *mr, unsigned usage, slap_mr_convert_func *convert, slap_mr_normalize_func *normalize, @@ -124,7 +124,7 @@ mr_add( int code; smr = (MatchingRule *) ch_calloc( 1, sizeof(MatchingRule) ); - memcpy( &smr->smr_mrule, mr, sizeof(LDAP_MATCHING_RULE)); + memcpy( &smr->smr_mrule, mr, sizeof(LDAPMatchingRule)); smr->smr_usage = usage; smr->smr_convert = convert; @@ -159,7 +159,7 @@ register_matching_rule( slap_mr_indexer_func *indexer, slap_mr_filter_func *filter ) { - LDAP_MATCHING_RULE *mr; + LDAPMatchingRule *mr; int code; const char *err; diff --git a/servers/slapd/oc.c b/servers/slapd/oc.c index 1817fe1143..c531021400 100644 --- a/servers/slapd/oc.c +++ b/servers/slapd/oc.c @@ -330,7 +330,7 @@ oc_insert( int oc_add( - LDAP_OBJECT_CLASS *oc, + LDAPObjectClass *oc, const char **err ) { @@ -338,7 +338,7 @@ oc_add( int code; soc = (ObjectClass *) ch_calloc( 1, sizeof(ObjectClass) ); - memcpy( &soc->soc_oclass, oc, sizeof(LDAP_OBJECT_CLASS) ); + memcpy( &soc->soc_oclass, oc, sizeof(LDAPObjectClass) ); if( soc->soc_sup_oids == NULL && soc->soc_kind == LDAP_SCHEMA_STRUCTURAL ) diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h index d95a2b50c4..eda6cf009b 100644 --- a/servers/slapd/proto-slap.h +++ b/servers/slapd/proto-slap.h @@ -90,7 +90,7 @@ LDAP_SLAPD_F (int) at_find_in_list LDAP_P(( AttributeType *sat, AttributeType ** LDAP_SLAPD_F (int) at_append_to_list LDAP_P(( AttributeType *sat, AttributeType ***listp )); LDAP_SLAPD_F (int) at_delete_from_list LDAP_P(( int pos, AttributeType ***listp )); LDAP_SLAPD_F (int) at_schema_info LDAP_P(( Entry *e )); -LDAP_SLAPD_F (int) at_add LDAP_P(( LDAP_ATTRIBUTE_TYPE *at, const char **err )); +LDAP_SLAPD_F (int) at_add LDAP_P(( LDAPAttributeType *at, const char **err )); LDAP_SLAPD_F (int) is_at_subtype LDAP_P(( AttributeType *sub, @@ -566,7 +566,7 @@ LDAP_SLAPD_F (ObjectClass *) oc_find LDAP_P(( const char *ocname)); LDAP_SLAPD_F (int) oc_add LDAP_P(( - LDAP_OBJECT_CLASS *oc, + LDAPObjectClass *oc, const char **err)); LDAP_SLAPD_F (int) is_object_subclass LDAP_P(( @@ -578,7 +578,7 @@ LDAP_SLAPD_F (Syntax *) syn_find LDAP_P((const char *synname)); LDAP_SLAPD_F (Syntax *) syn_find_desc LDAP_P((const char *syndesc, int *slen)); #ifdef SLAPD_BINARY_CONVERSION LDAP_SLAPD_F (int) syn_add LDAP_P(( - LDAP_SYNTAX *syn, + LDAPSyntax *syn, unsigned flags, slap_syntax_validate_func *validate, slap_syntax_transform_func *normalize, @@ -588,7 +588,7 @@ LDAP_SLAPD_F (int) syn_add LDAP_P(( const char **err)); #else LDAP_SLAPD_F (int) syn_add LDAP_P(( - LDAP_SYNTAX *syn, + LDAPSyntax *syn, unsigned flags, slap_syntax_validate_func *validate, slap_syntax_transform_func *normalize, @@ -597,7 +597,7 @@ LDAP_SLAPD_F (int) syn_add LDAP_P(( #endif LDAP_SLAPD_F (MatchingRule *) mr_find LDAP_P((const char *mrname)); -LDAP_SLAPD_F (int) mr_add LDAP_P((LDAP_MATCHING_RULE *mr, +LDAP_SLAPD_F (int) mr_add LDAP_P((LDAPMatchingRule *mr, unsigned usage, slap_mr_convert_func *convert, slap_mr_normalize_func *normalize, diff --git a/servers/slapd/schemaparse.c b/servers/slapd/schemaparse.c index 6f00e93eef..7009c265a9 100644 --- a/servers/slapd/schemaparse.c +++ b/servers/slapd/schemaparse.c @@ -166,7 +166,7 @@ parse_oc( char **argv ) { - LDAP_OBJECT_CLASS *oc; + LDAPObjectClass *oc; int code; const char *err; char *oid = NULL; @@ -257,7 +257,7 @@ parse_at( char **argv ) { - LDAP_ATTRIBUTE_TYPE *at; + LDAPAttributeType *at; int code; const char *err; char *oid = NULL; diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h index 2e9fbb0375..cf898b98b0 100644 --- a/servers/slapd/slap.h +++ b/servers/slapd/slap.h @@ -200,7 +200,7 @@ typedef int slap_syntax_transform_func LDAP_P(( struct berval ** out)); typedef struct slap_syntax { - LDAP_SYNTAX ssyn_syn; + LDAPSyntax ssyn_syn; #define ssyn_oid ssyn_syn.syn_oid #define ssyn_desc ssyn_syn.syn_desc #define ssyn_extensions ssyn_syn.syn_extensions @@ -273,7 +273,7 @@ typedef int slap_mr_filter_func LDAP_P(( struct berval ***keys )); typedef struct slap_matching_rule { - LDAP_MATCHING_RULE smr_mrule; + LDAPMatchingRule smr_mrule; unsigned smr_usage; #define SLAP_MR_TYPE_MASK 0xFF00U @@ -312,7 +312,7 @@ typedef struct slap_matching_rule { typedef struct slap_attribute_type { char *sat_cname; - LDAP_ATTRIBUTE_TYPE sat_atype; + LDAPAttributeType sat_atype; struct slap_attribute_type *sat_sup; struct slap_attribute_type **sat_subtypes; MatchingRule *sat_equality; @@ -343,7 +343,7 @@ typedef struct slap_attribute_type { #define is_at_no_user_mod(at) ((at)->sat_no_user_mod) typedef struct slap_object_class { - LDAP_OBJECT_CLASS soc_oclass; + LDAPObjectClass soc_oclass; struct slap_object_class **soc_sups; AttributeType **soc_required; AttributeType **soc_allowed; diff --git a/servers/slapd/syntax.c b/servers/slapd/syntax.c index 404744950e..7229fb3773 100644 --- a/servers/slapd/syntax.c +++ b/servers/slapd/syntax.c @@ -101,7 +101,7 @@ syn_insert( int syn_add( - LDAP_SYNTAX *syn, + LDAPSyntax *syn, unsigned flags, slap_syntax_validate_func *validate, slap_syntax_transform_func *normalize, @@ -118,7 +118,7 @@ syn_add( ssyn = (Syntax *) ch_calloc( 1, sizeof(Syntax) ); - memcpy( &ssyn->ssyn_syn, syn, sizeof(LDAP_SYNTAX) ); + memcpy( &ssyn->ssyn_syn, syn, sizeof(LDAPSyntax) ); ssyn->ssyn_next = NULL; @@ -144,7 +144,7 @@ register_syntax( slap_syntax_transform_func *ber2str, slap_syntax_transform_func *str2ber ) { - LDAP_SYNTAX *syn; + LDAPSyntax *syn; int code; const char *err; -- 2.39.5