libldapschema: replacing ldapschema_objectclass_initialize()

Replacing ldapschema_objectclass_initialize() with commo function
ldapschema_model_initialize().

3 files changed, 4 insertions, 51 deletions

diff --git a/lib/libldapschema/llexer.c b/lib/libldapschema/llexer.c
index 66d7054..9c64991 100644
--- a/lib/libldapschema/llexer.c
+++ b/lib/libldapschema/llexer.c
@@ -805,37 +805,17 @@ LDAPSchemaObjectclass * ldapschema_parse_objectclass(LDAPSchema * lsd, const str
    int                                 err;
    LDAPSchemaObjectclass             * objcls;
 
-   objcls   = NULL;
-   argv     = NULL;
-
-   // initialize objectClass
-   if ((objcls = ldapschema_objectclass_initialize(lsd)) == NULL)
-      return(NULL);
-
    // parses definition
-   if ((argc = ldapschema_definition_split_len(lsd, &objcls->model, def, &argv)) == -1)
-   {
-      ldapschema_objectclass_free(objcls);
+   argv = NULL;
+   if ((argc = ldapschema_definition_split_len(lsd, NULL, def, &argv)) == -1)
       return(NULL);
-   };
 
-   // copy definition and oid into syntax
-   if ((objcls->model.oid = strdup(argv[0])) == NULL)
-   {
-      lsd->errcode = LDAPSCHEMA_NO_MEMORY;
-      ldapschema_value_free(argv);
-      ldapschema_objectclass_free(objcls);
-      return(NULL);
-   };
-   if ((objcls->model.definition = malloc(def->bv_len+1)) == NULL)
+   // initialize objectClass
+   if ((objcls = (LDAPSchemaObjectclass *)ldapschema_model_initialize(lsd, argv[0], LDAPSCHEMA_OBJECTCLASS, def)) == NULL)
    {
-      lsd->errcode = LDAPSCHEMA_NO_MEMORY;
       ldapschema_value_free(argv);
-      ldapschema_objectclass_free(objcls);
       return(NULL);
    };
-   memcpy(objcls->model.definition, def->bv_val, def->bv_len);
-   objcls->model.definition[def->bv_len] = '\0';
 
    // processes attribute definition
    for(pos = 1; pos < argc; pos++)
@@ -979,9 +959,6 @@ LDAPSchemaObjectclass * ldapschema_parse_objectclass(LDAPSchema * lsd, const str
    };
    ldapschema_value_free(argv);
 
-   // adds specification to syntax
-   objcls->model.spec = ldapschema_spec_search(objcls->model.oid);
-
    // register objectClass
    if ((err = ldapschema_model_register(lsd, &objcls->model)) != LDAP_SUCCESS)
    {
diff --git a/lib/libldapschema/lmemory.c b/lib/libldapschema/lmemory.c
index c754f2e..372841b 100644
--- a/lib/libldapschema/lmemory.c
+++ b/lib/libldapschema/lmemory.c
@@ -710,26 +710,6 @@ void ldapschema_objectclass_free(LDAPSchemaObjectclass * objectclass)
 }
 
 
-LDAPSchemaObjectclass * ldapschema_objectclass_initialize(LDAPSchema * lsd)
-{
-   LDAPSchemaObjectclass * objectclass;
-
-   assert(lsd != NULL);
-
-   // initialize syntax
-   if ((objectclass = malloc(sizeof(LDAPSchemaObjectclass))) == NULL)
-   {
-      lsd->errcode = LDAPSCHEMA_NO_MEMORY;
-      return(objectclass);
-   };
-   bzero(objectclass, sizeof(LDAPSchemaObjectclass));
-   objectclass->model.size = sizeof(LDAPSchemaObjectclass);
-   objectclass->model.type = LDAPSCHEMA_OBJECTCLASS;
-
-   return(objectclass);
-}
-
-
 void * ldapschema_oid(LDAPSchema * lsd, const char * oid, size_t type)
 {
    size_t               low;
diff --git a/lib/libldapschema/lmemory.h b/lib/libldapschema/lmemory.h
index 3579e71..639f21c 100644
--- a/lib/libldapschema/lmemory.h
+++ b/lib/libldapschema/lmemory.h
@@ -89,10 +89,6 @@ void
 ldapschema_objectclass_free(
          LDAPSchemaObjectclass * objectclass );
 
-LDAPSchemaObjectclass *
-ldapschema_objectclass_initialize(
-         LDAPSchema            * lsd );
-
 char **
 ldapschema_value_dup(
          char                 ** vals );