Conform schema routines to LDAP naming conventions

diff --git a/include/ldap_schema.h b/include/ldap_schema.h
index e6933d9d229d1837ed295618e0a6c261e2a96ca4..fe7ab543dde5b10186a45f64f3f86d4216420a11 100644 (file)
--- a/include/ldap_schema.h
+++ b/include/ldap_schema.h
@@ -36,14 +36,14 @@ LDAP_BEGIN_DECL
 typedef struct ldap_schema_extension_item {
        char *lsei_name;
        char **lsei_values;
-} LDAP_SCHEMA_EXTENSION_ITEM;
+} LDAPSchemaExtensionItem;
 
 typedef struct ldap_syntax {
        char *syn_oid;          /* REQUIRED */
        char **syn_names;       /* OPTIONAL */
        char *syn_desc;         /* OPTIONAL */
-       LDAP_SCHEMA_EXTENSION_ITEM **syn_extensions; /* OPTIONAL */
-} LDAP_SYNTAX;
+       LDAPSchemaExtensionItem **syn_extensions; /* OPTIONAL */
+} LDAPSyntax;
 
 typedef struct ldap_matchingrule {
        char *mr_oid;           /* REQUIRED */
@@ -51,8 +51,8 @@ typedef struct ldap_matchingrule {
        char *mr_desc;          /* OPTIONAL */
        int  mr_obsolete;       /* OPTIONAL */
        char *mr_syntax_oid;    /* REQUIRED */
-       LDAP_SCHEMA_EXTENSION_ITEM **mr_extensions; /* OPTIONAL */
-} LDAP_MATCHING_RULE;
+       LDAPSchemaExtensionItem **mr_extensions; /* OPTIONAL */
+} LDAPMatchingRule;
 
 typedef struct ldap_attributetype {
        char *at_oid;           /* REQUIRED */
@@ -70,8 +70,8 @@ typedef struct ldap_attributetype {
        int  at_no_user_mod;    /* 0=no, 1=yes */
        int  at_usage;          /* 0=userApplications, 1=directoryOperation,
                                   2=distributedOperation, 3=dSAOperation */
-       LDAP_SCHEMA_EXTENSION_ITEM **at_extensions; /* OPTIONAL */
-} LDAP_ATTRIBUTE_TYPE;
+       LDAPSchemaExtensionItem **at_extensions; /* OPTIONAL */
+} LDAPAttributeType;
 
 typedef struct ldap_objectclass {
        char *oc_oid;           /* REQUIRED */
@@ -82,8 +82,8 @@ typedef struct ldap_objectclass {
        int  oc_kind;           /* 0=ABSTRACT, 1=STRUCTURAL, 2=AUXILIARY */
        char **oc_at_oids_must; /* OPTIONAL */
        char **oc_at_oids_may;  /* OPTIONAL */
-       LDAP_SCHEMA_EXTENSION_ITEM **oc_extensions; /* OPTIONAL */
-} LDAP_OBJECT_CLASS;
+       LDAPSchemaExtensionItem **oc_extensions; /* OPTIONAL */
+} LDAPObjectClass;
 
 #define LDAP_SCHEMA_NO                         0
 #define LDAP_SCHEMA_YES                                1
@@ -109,81 +109,81 @@ typedef struct ldap_objectclass {
 
 LDAP_F( LDAP_CONST char * )
 ldap_syntax2name LDAP_P((
-       LDAP_SYNTAX * syn ));
+       LDAPSyntax * syn ));
 
 LDAP_F( LDAP_CONST char * )
 ldap_matchingrule2name LDAP_P((
-       LDAP_MATCHING_RULE * mr ));
+       LDAPMatchingRule * mr ));
 
 LDAP_F( LDAP_CONST char * )
 ldap_attributetype2name LDAP_P((
-       LDAP_ATTRIBUTE_TYPE * at ));
+       LDAPAttributeType * at ));
 
 LDAP_F( LDAP_CONST char * )
 ldap_objectclass2name LDAP_P((
-       LDAP_OBJECT_CLASS * oc ));
+       LDAPObjectClass * oc ));
 
 LDAP_F( void )
 ldap_syntax_free LDAP_P((
-       LDAP_SYNTAX * syn ));
+       LDAPSyntax * syn ));
 
 LDAP_F( void )
 ldap_matchingrule_free LDAP_P((
-       LDAP_MATCHING_RULE * mr ));
+       LDAPMatchingRule * mr ));
 
 LDAP_F( void )
 ldap_attributetype_free LDAP_P((
-       LDAP_ATTRIBUTE_TYPE * at ));
+       LDAPAttributeType * at ));
 
 LDAP_F( void )
 ldap_objectclass_free LDAP_P((
-       LDAP_OBJECT_CLASS * oc ));
+       LDAPObjectClass * oc ));
 
-LDAP_F( LDAP_OBJECT_CLASS * )
+LDAP_F( LDAPObjectClass * )
 ldap_str2objectclass LDAP_P((
        LDAP_CONST char * s,
        int * code,
        LDAP_CONST char ** errp,
        LDAP_CONST int flags ));
 
-LDAP_F( LDAP_ATTRIBUTE_TYPE * )
+LDAP_F( LDAPAttributeType * )
 ldap_str2attributetype LDAP_P((
        LDAP_CONST char * s,
        int * code,
        LDAP_CONST char ** errp,
        LDAP_CONST int flags ));
 
-LDAP_F( LDAP_SYNTAX * )
+LDAP_F( LDAPSyntax * )
 ldap_str2syntax LDAP_P((
        LDAP_CONST char * s,
        int * code,
        LDAP_CONST char ** errp,
        LDAP_CONST int flags ));
 
-LDAP_F( LDAP_MATCHING_RULE * )
+LDAP_F( LDAPMatchingRule * )
 ldap_str2matchingrule LDAP_P((
        LDAP_CONST char * s,
        int * code,
        LDAP_CONST char ** errp,
        LDAP_CONST int flags ));
 
-LDAP_F( char *)
+LDAP_F( char * )
 ldap_objectclass2str LDAP_P((
-       LDAP_CONST LDAP_OBJECT_CLASS * oc ));
+       LDAP_CONST LDAPObjectClass * oc ));
 
-LDAP_F( char *)
+LDAP_F( char * )
 ldap_attributetype2str LDAP_P((
-       LDAP_CONST LDAP_ATTRIBUTE_TYPE * at ));
+       LDAP_CONST LDAPAttributeType * at ));
 
-LDAP_F( char *)
+LDAP_F( char * )
 ldap_syntax2str LDAP_P((
-       LDAP_CONST LDAP_SYNTAX * syn ));
+       LDAP_CONST LDAPSyntax * syn ));
 
-LDAP_F( char *)
+LDAP_F( char * )
 ldap_matchingrule2str LDAP_P((
-       LDAP_CONST LDAP_MATCHING_RULE * mr ));
+       LDAP_CONST LDAPMatchingRule * mr ));
 
-LDAP_F( char *)
+LDAP_F( char * )
 ldap_scherr2str LDAP_P((
        int code )) LDAP_GCCATTR((const));