From a6b9be7ae09858f9057c298a9ac70e0c2dc9344c Mon Sep 17 00:00:00 2001
From: barbieri <barbieri>
Date: Thu, 3 Sep 2009 00:17:27 +0000
Subject: [PATCH] eina_log: fix error handling and handle deleted domains.

EINA_SAFETY_CHECKS will call eina_log, so calling these from inside
eina_log_print() may lead to recursion, that is really bad (although
it seems it would never lead to infinite recursion).

handle d->deleted, also showing error.



git-svn-id: http://svn.enlightenment.org/svn/e/trunk/eina@42198 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
---
 src/lib/eina_log.c | 47 ++++++++++++++++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 15 deletions(-)

diff --git a/src/lib/eina_log.c b/src/lib/eina_log.c
index f183a9d..507c152 100644
--- a/src/lib/eina_log.c
+++ b/src/lib/eina_log.c
@@ -896,13 +896,7 @@ eina_log_print_cb_file(const Eina_Log_Domain *d, __UNUSED__ Eina_Log_Level level
 		const char *file, const char *fnc, int line, const char *fmt,
 		void *data, va_list args)
 {
-   FILE *f;
-
-   EINA_SAFETY_ON_NULL_RETURN(file);
-   EINA_SAFETY_ON_NULL_RETURN(fnc);
-   EINA_SAFETY_ON_NULL_RETURN(fmt);
-
-   f = data;
+   FILE *f = data;
    fprintf(f, "%s %s:%d %s() ", d->name, file, line, fnc);
    vfprintf(f, fmt, args);
 }
@@ -914,14 +908,37 @@ eina_log_print(int domain, Eina_Log_Level level, const char *file,
    Eina_Log_Domain *d;
    va_list args;
 
-   EINA_SAFETY_ON_NULL_RETURN(file);
-   EINA_SAFETY_ON_NULL_RETURN(fnc);
-   EINA_SAFETY_ON_NULL_RETURN(fmt);
-
-   if (EINA_UNLIKELY(domain >= _log_domains_count)) return;
-   if (EINA_UNLIKELY(domain < 0)) return;
-
-   d = &_log_domains[domain];
+#ifdef EINA_SAFETY_CHECKS
+   if (EINA_UNLIKELY(file == NULL))
+     {
+	fputs("ERR: eina_log_print() file == NULL\n", stderr);
+	return;
+     }
+   if (EINA_UNLIKELY(fnc == NULL))
+     {
+	fputs("ERR: eina_log_print() fnc == NULL\n", stderr);
+	return;
+     }
+   if (EINA_UNLIKELY(fmt == NULL))
+     {
+	fputs("ERR: eina_log_print() fmt == NULL\n", stderr);
+	return;
+     }
+   if (EINA_UNLIKELY(domain >= _log_domains_count) ||
+       EINA_UNLIKELY(domain < 0))
+     {
+	fprintf(stderr, "ERR: eina_log_print() unknown domain %d\n", domain);
+	return;
+     }
+#endif
+   d = _log_domains + domain;
+#ifdef EINA_SAFETY_CHECKS
+   if (EINA_UNLIKELY(d->deleted))
+     {
+	fprintf(stderr, "ERR: eina_log_print() domain %d is deleted\n", domain);
+	return;
+     }
+#endif
 
    if (level > d->level) return;
 
-- 
2.7.4