eolian: remove now unused database init/shutdown

diff --git a/src/lib/eolian/eolian.c b/src/lib/eolian/eolian.c
index edb9182..4a38fb9 100644 (file)
--- a/src/lib/eolian/eolian.c
+++ b/src/lib/eolian/eolian.c
@@ -36,7 +36,6 @@ EAPI int eolian_init(void)
         return EINA_FALSE;
      }
 
-   database_init();
    eo_lexer_init();
    return ++_eolian_init_counter;
 }
@@ -58,7 +57,6 @@ EAPI int eolian_shutdown(void)
               EINA_LOG_STATE_SHUTDOWN);
 
         eo_lexer_shutdown();
-        database_shutdown();
         eina_prefix_free(_eolian_prefix);
         _eolian_prefix = NULL;
 

diff --git a/src/lib/eolian/eolian_database.c b/src/lib/eolian/eolian_database.c
index fdba068..8b82503 100644 (file)
--- a/src/lib/eolian/eolian_database.c
+++ b/src/lib/eolian/eolian_database.c
@@ -8,34 +8,6 @@
 #include "eolian_database.h"
 #include "eolian_priv.h"
 
-static int _database_init_count = 0;
-
-static void
-_hashlist_free(void *data)
-{
-   eina_list_free((Eina_List*)data);
-}
-
-int
-database_init()
-{
-   if (_database_init_count > 0) return ++_database_init_count;
-   return ++_database_init_count;
-}
-
-int
-database_shutdown()
-{
-   if (_database_init_count <= 0)
-     {
-        ERR("Init count not greater than 0 in shutdown.");
-        return 0;
-     }
-   _database_init_count--;
-
-   return _database_init_count;
-}
-
 void
 database_decl_add(Eolian *state, Eina_Stringshare *name,
                   Eolian_Declaration_Type type,
@@ -560,6 +532,12 @@ database_unit_del(Eolian_Unit *unit)
    eina_hash_free(unit->decls);
 }
 
+static void
+_hashlist_free(void *data)
+{
+   eina_list_free((Eina_List*)data);
+}
+
 EAPI Eolian *
 eolian_new(void)
 {
@@ -687,8 +665,7 @@ _eolian_file_parse_nodep(Eolian_Unit *parent, const char *filepath)
 {
    Eina_Bool is_eo;
    const char *eopath;
-   if (_database_init_count <= 0)
-     return NULL;
+
    is_eo = eina_str_has_suffix(filepath, EO_SUFFIX);
    if (!is_eo && !eina_str_has_suffix(filepath, EOT_SUFFIX))
      {
@@ -734,6 +711,9 @@ _parse_deferred(Eolian_Unit *parent)
 EAPI const Eolian_Unit *
 eolian_file_parse(Eolian *state, const char *filepath)
 {
+   if (!state)
+     return NULL;
+
    Eolian_Unit *ret = _eolian_file_parse_nodep((Eolian_Unit *)state, filepath);
    if (!ret)
      return NULL;
@@ -767,7 +747,7 @@ eolian_all_eot_files_parse(Eolian *state)
 {
    Parse_Data pd = { state, EINA_TRUE };
 
-   if (_database_init_count <= 0)
+   if (!state)
      return EINA_FALSE;
 
    eina_hash_foreach(state->filenames_eot, _tfile_parse, &pd);
@@ -795,7 +775,7 @@ eolian_all_eo_files_parse(Eolian *state)
 {
    Parse_Data pd = { state, EINA_TRUE };
 
-   if (_database_init_count <= 0)
+   if (!state)
      return EINA_FALSE;
 
    eina_hash_foreach(state->filenames_eo, _file_parse, &pd);

diff --git a/src/lib/eolian/eolian_database.h b/src/lib/eolian/eolian_database.h
index edef41e..e7e7539 100644 (file)
--- a/src/lib/eolian/eolian_database.h
+++ b/src/lib/eolian/eolian_database.h
@@ -314,9 +314,6 @@ struct _Eolian_Variable
    Eina_Bool is_extern :1;
 };
 
-int database_init(void);
-int database_shutdown(void);
-
 char *database_class_to_filename(const char *cname);
 Eina_Bool database_validate(Eolian *state, const Eolian_Unit *src);