libldapschema: replacing ldapschema_attributetype_initialize()

Replacing ldapschema_attributetype_initialize() with commo function
ldapschema_model_initialize().

3 files changed, 4 insertions, 50 deletions

diff --git a/lib/libldapschema/libldapschema.h b/lib/libldapschema/libldapschema.h
index 3d0eeaa..60ff776 100644
--- a/lib/libldapschema/libldapschema.h
+++ b/lib/libldapschema/libldapschema.h
@@ -215,10 +215,6 @@ void
 ldapschema_attributetype_free(
          LDAPSchemaAttributeType  * attr );
 
-LDAPSchemaAttributeType *
-ldapschema_attributetype_initialize(
-         LDAPSchema            * lsd );
-
 void
 ldapschema_ext_free(
          LDAPSchemaExtension   * ext );
diff --git a/lib/libldapschema/llexer.c b/lib/libldapschema/llexer.c
index 9c64991..b009e6a 100644
--- a/lib/libldapschema/llexer.c
+++ b/lib/libldapschema/llexer.c
@@ -479,37 +479,17 @@ LDAPSchemaAttributeType * ldapschema_parse_attributetype(LDAPSchema * lsd, const
    LDAPSchemaAttributeType     * attr;
    LDAPSchemaAlias             * alias;
 
-   attr     = NULL;
-   argv     = NULL;
-
-   // initialize attributeType
-   if ((attr = ldapschema_attributetype_initialize(lsd)) == NULL)
-      return(NULL);
-
    // parses definition
-   if ((argc = ldapschema_definition_split_len(lsd, &attr->model, def, &argv)) == -1)
-   {
-      ldapschema_attributetype_free(attr);
+   argv = NULL;
+   if ((argc = ldapschema_definition_split_len(lsd, NULL, def, &argv)) == -1)
       return(NULL);
-   };
 
-   // copy definition and oid into syntax
-   if ((attr->model.oid = strdup(argv[0])) == NULL)
-   {
-      lsd->errcode = LDAPSCHEMA_NO_MEMORY;
-      ldapschema_value_free(argv);
-      ldapschema_attributetype_free(attr);
-      return(NULL);
-   };
-   if ((attr->model.definition = malloc(def->bv_len+1)) == NULL)
+   // initialize syntax
+   if ((attr = (LDAPSchemaAttributeType *)ldapschema_model_initialize(lsd, argv[0], LDAPSCHEMA_ATTRIBUTETYPE, def)) == NULL)
    {
-      lsd->errcode = LDAPSCHEMA_NO_MEMORY;
       ldapschema_value_free(argv);
-      ldapschema_attributetype_free(attr);
       return(NULL);
    };
-   memcpy(attr->model.definition, def->bv_val, def->bv_len);
-   attr->model.definition[def->bv_len] = '\0';
 
    // processes attribute definition
    for(pos = 1; pos < argc; pos++)
@@ -685,9 +665,6 @@ LDAPSchemaAttributeType * ldapschema_parse_attributetype(LDAPSchema * lsd, const
    };
    ldapschema_value_free(argv);
 
-   // adds specification to syntax
-   attr->model.spec = ldapschema_spec_search(attr->model.oid);
-
    // register attributeType
    if ((err = ldapschema_model_register(lsd, &attr->model)) != LDAP_SUCCESS)
    {
diff --git a/lib/libldapschema/lmemory.c b/lib/libldapschema/lmemory.c
index 372841b..5f2880c 100644
--- a/lib/libldapschema/lmemory.c
+++ b/lib/libldapschema/lmemory.c
@@ -94,25 +94,6 @@ void ldapschema_attributetype_free( LDAPSchemaAttributeType  * attr )
 }
 
 
-LDAPSchemaAttributeType * ldapschema_attributetype_initialize(LDAPSchema * lsd)
-{
-   LDAPSchemaAttributeType   * attr;
-
-   assert(lsd  != NULL);
-
-   if ((attr = malloc(sizeof(LDAPSchemaAttributeType))) == NULL)
-   {
-      lsd->errcode = LDAPSCHEMA_NO_MEMORY;
-      return(NULL);
-   };
-   bzero(attr, sizeof(LDAPSchemaAttributeType));
-   attr->model.size = sizeof(LDAPSchemaAttributeType);
-   attr->model.type = LDAPSCHEMA_ATTRIBUTETYPE;
-
-   return(attr);
-}
-
-
 /// counts number of values in list
 /// @param[in]  vals   Reference to allocated ldap_schema struct
 ///