* Fix some init/shutdown procedure.

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/eina@40892 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/eina_hash.c b/src/lib/eina_hash.c
index 2a450ab..48cb10b 100644 (file)
--- a/src/lib/eina_hash.c
+++ b/src/lib/eina_hash.c
@@ -21,6 +21,7 @@
 # include "config.h"
 #endif
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #ifdef _MSC_VER
@@ -664,7 +665,11 @@ EAPI int
 eina_hash_init(void)
 {
    if (!_eina_hash_init_count)
-     eina_error_init();
+     if (!eina_error_init())
+       {
+         fprintf(stderr, "Could not initialize eina error module\n");
+         return 0;
+       }
 
    return ++_eina_hash_init_count;
 }

diff --git a/src/lib/eina_list.c b/src/lib/eina_list.c
index 3d01d12..744a112 100644 (file)
--- a/src/lib/eina_list.c
+++ b/src/lib/eina_list.c
@@ -446,9 +446,23 @@ eina_list_init(void)
 
    if (!_eina_list_init_count)
      {
-       eina_error_init();
-       eina_magic_string_init();
-       eina_mempool_init();
+       if (!eina_error_init())
+         {
+            fprintf(stderr, "Could not initialize eina error module\n");
+            return 0;
+         }
+
+       if (!eina_magic_string_init())
+         {
+            EINA_ERROR_PERR("ERROR: Could not initialize eina magic string module.\n");
+            goto on_magic_string_fail;
+         }
+
+       if (!eina_mempool_init())
+         {
+            EINA_ERROR_PERR("ERROR: Could not initialize eina mempool module.\n");
+            goto on_mempool_fail;
+         }
 
 #ifdef EINA_DEFAULT_MEMPOOL
        choice = "pass_through";
@@ -462,14 +476,15 @@ eina_list_init(void)
        if (!_eina_list_mp)
          {
            EINA_ERROR_PERR("ERROR: Mempool for list cannot be allocated in list init.\n");
-           abort();
+          goto on_init_fail;
          }
        _eina_list_accounting_mp = eina_mempool_new(choice, "list_accounting", NULL,
                                                   sizeof (Eina_List_Accounting), 80);
        if (!_eina_list_accounting_mp)
          {
            EINA_ERROR_PERR("ERROR: Mempool for list accounting cannot be allocated in list init.\n");
-           abort();
+          eina_mempool_delete(_eina_list_mp);
+          goto on_init_fail;
          }
 
        eina_magic_string_set(EINA_MAGIC_ITERATOR,
@@ -487,6 +502,14 @@ eina_list_init(void)
      }
 
    return ++_eina_list_init_count;
+
+ on_init_fail:
+   eina_mempool_shutdown();
+ on_mempool_fail:
+   eina_magic_string_shutdown();
+ on_magic_string_fail:
+   eina_error_shutdown();
+   return 0;
 }
 
 /**