conform schema routines to ldap naming conventions

diff --git a/servers/slapd/at.c b/servers/slapd/at.c
index 4ad381d9ffaef74806cf4de54a145fc21b2eea28..910889ad75e32d2a275cbe2fa495b94dce9ac7da 100644 (file)
--- 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 23c0f70bfb582c1991d84a73778e3378c2b82e1c..f40535436a61a9f2ea2f8319216c22233555e287 100644 (file)
--- 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 1817fe114335178e3cd8166195e9acdf94744948..c531021400ac5ce56a8412887edd6e6160f12e09 100644 (file)
--- 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 d95a2b50c4596b2bf2bc87c201901fa52891adda..eda6cf009b8fa1fd856ac1e48f71e13dae379461 100644 (file)
--- 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 6f00e93eef2fa297d1cbfed1887fd8d11004caca..7009c265a91a443629ec3999170262ba9eff4940 100644 (file)
--- 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 2e9fbb03755ced9e67d6bb23697e2d48bf4e3ad7..cf898b98b08ff132ee308945b3317630acc60d6b 100644 (file)
--- 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 404744950e1e71bcbb33182a8db63623939ee806..7229fb37737d8f6ce3ce1100692e4ef77afdc9b1 100644 (file)
--- 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;