libldapschema: replacing ldapschema_syntax_initialize()

Replacing ldapschema_syntax_initialize() with commo function
ldapschema_model_initialize().

3 files changed, 13 insertions, 58 deletions

diff --git a/lib/libldapschema/libldapschema.h b/lib/libldapschema/libldapschema.h
index 73c572f..3d0eeaa 100644
--- a/lib/libldapschema/libldapschema.h
+++ b/lib/libldapschema/libldapschema.h
@@ -254,10 +254,6 @@ ldapschema_oid(
          const char            * oid,
          size_t                  type );
 
-LDAPSchemaSyntax *
-ldapschema_syntax_initialize(
-         LDAPSchema            * lsd );
-
 char **
 ldapschema_value_add(
          char                 ** vals,
diff --git a/lib/libldapschema/llexer.c b/lib/libldapschema/llexer.c
index f7e440e..66d7054 100644
--- a/lib/libldapschema/llexer.c
+++ b/lib/libldapschema/llexer.c
@@ -1107,37 +1107,17 @@ LDAPSchemaSyntax * ldapschema_parse_syntax(LDAPSchema * lsd, const struct berval
    int                     err;
    LDAPSchemaSyntax      * syntax;
 
-   syntax   = NULL;
-   argv     = NULL;
-
-   // initialize syntax
-   if ((syntax = ldapschema_syntax_initialize(lsd)) == NULL)
-      return(syntax);
-
    // parses definition
-   if ((argc = ldapschema_definition_split_len(lsd, &syntax->model, def, &argv)) == -1)
-   {
-      ldapschema_syntax_free(syntax);
+   argv = NULL;
+   if ((argc = ldapschema_definition_split_len(lsd, NULL, def, &argv)) == -1)
       return(NULL);
-   };
 
-   // copy definition and oid into syntax
-   if ((syntax->model.oid = strdup(argv[0])) == NULL)
-   {
-      lsd->errcode = LDAPSCHEMA_NO_MEMORY;
-      ldapschema_value_free(argv);
-      ldapschema_syntax_free(syntax);
-      return(NULL);
-   };
-   if ((syntax->model.definition = malloc(def->bv_len+1)) == NULL)
+   // initialize syntax
+   if ((syntax = (LDAPSchemaSyntax *)ldapschema_model_initialize(lsd, argv[0], LDAPSCHEMA_SYNTAX, def)) == NULL)
    {
-      lsd->errcode = LDAPSCHEMA_NO_MEMORY;
       ldapschema_value_free(argv);
-      ldapschema_syntax_free(syntax);
       return(NULL);
    };
-   memcpy(syntax->model.definition, def->bv_val, def->bv_len);
-   syntax->model.definition[def->bv_len] = '\0';
 
    // processes attribute definition
    for(pos = 1; pos < argc; pos++)
@@ -1187,20 +1167,19 @@ LDAPSchemaSyntax * ldapschema_parse_syntax(LDAPSchema * lsd, const struct berval
    };
    ldapschema_value_free(argv);
 
-   // adds specification to syntax
-   if ((syntax->model.spec = ldapschema_spec_search(syntax->model.oid)) != NULL)
+   // copies information from specification
+   if ((syntax->model.spec))
    {
-      syntax->model.flags |= syntax->model.spec->flags;
       syntax->data_class   = syntax->model.spec->subtype;
-   };
 
-   // compiles regular expression, if available
-   if ( ((syntax->model.spec)) && ((syntax->model.spec->re_posix)) )
-   {
-      if ((regcomp(&syntax->re, syntax->model.spec->re_posix, REG_EXTENDED | REG_NOSUB)))
+      // compiles regular expression, if available
+      if ((syntax->model.spec->re_posix))
       {
-         regfree(&syntax->re);
-         bzero(&syntax->re, sizeof(syntax->re));
+         if ((regcomp(&syntax->re, syntax->model.spec->re_posix, REG_EXTENDED | REG_NOSUB)))
+         {
+            regfree(&syntax->re);
+            bzero(&syntax->re, sizeof(syntax->re));
+         };
       };
    };
 
diff --git a/lib/libldapschema/lmemory.c b/lib/libldapschema/lmemory.c
index 1ed4694..c754f2e 100644
--- a/lib/libldapschema/lmemory.c
+++ b/lib/libldapschema/lmemory.c
@@ -788,26 +788,6 @@ void ldapschema_syntax_free(LDAPSchemaSyntax * syntax)
 }
 
 
-LDAPSchemaSyntax * ldapschema_syntax_initialize(LDAPSchema * lsd)
-{
-   LDAPSchemaSyntax * syntax;
-
-   assert(lsd != NULL);
-
-   // initialize syntax
-   if ((syntax = malloc(sizeof(LDAPSchemaSyntax))) == NULL)
-   {
-      lsd->errcode = LDAPSCHEMA_NO_MEMORY;
-      return(syntax);
-   };
-   bzero(syntax, sizeof(LDAPSchemaSyntax));
-   syntax->model.size = sizeof(LDAPSchemaSyntax);
-   syntax->model.type = LDAPSCHEMA_SYNTAX;
-
-   return(syntax);
-}
-
-
 char ** ldapschema_value_add( char ** vals, const char * val, int * countp)
 {
    int      count;