From 5b32bc617b69d60eae933dd7be36406b5bf834fa Mon Sep 17 00:00:00 2001 From: dieb Date: Tue, 25 Aug 2009 21:26:27 +0000 Subject: [PATCH] Add eina_log module into the main module and global header. git-svn-id: http://svn.enlightenment.org/svn/e/trunk/eina@41985 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/include/Eina.h | 1 + src/lib/eina_main.c | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/src/include/Eina.h b/src/include/Eina.h index 84d6341..d896fec 100644 --- a/src/include/Eina.h +++ b/src/include/Eina.h @@ -166,6 +166,7 @@ extern "C" { #include "eina_module.h" #include "eina_mempool.h" #include "eina_error.h" +#include "eina_log.h" #include "eina_array.h" #include "eina_stringshare.h" #include "eina_magic.h" diff --git a/src/lib/eina_main.c b/src/lib/eina_main.c index bb586f9..39fc420 100644 --- a/src/lib/eina_main.c +++ b/src/lib/eina_main.c @@ -25,6 +25,7 @@ #include "eina_types.h" #include "eina_main.h" #include "eina_error.h" +#include "eina_log.h" #include "eina_hash.h" #include "eina_stringshare.h" #include "eina_list.h" @@ -99,6 +100,13 @@ eina_init(void) fprintf(stderr, "Could not initialize eina error module.\n"); return 0; } + + if (!eina_log_init()) + { + fprintf(stderr, "Could not initialize eina log module.\n"); + goto log_init_error; + } + if (!eina_hash_init()) { EINA_ERROR_PERR("Could not initialize eina hash module.\n"); @@ -158,7 +166,10 @@ eina_init(void) stringshare_init_error: eina_hash_shutdown(); hash_init_error: + eina_log_shutdown(); + log_init_error: eina_error_shutdown(); + return 0; } @@ -200,6 +211,7 @@ eina_shutdown(void) eina_list_shutdown(); eina_stringshare_shutdown(); eina_hash_shutdown(); + eina_log_shutdown(); eina_error_shutdown(); finish_shutdown: -- 2.7.4