Remove duplicate logging macros

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/efreet@56732 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/ChangeLog b/ChangeLog
index 91b2780..065e02e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -37,3 +37,4 @@
         * Remove efreet_xml_{init,shutdown}() from efreet_menu.c, it is done
           in efreet_init()
         * Set EFREET_MODULE_LOG_DOM variable to -1 after unregister
+        * Remove duplicate logging macros

diff --git a/src/lib/efreet_base.c b/src/lib/efreet_base.c
index d3cef6f..af3879f 100644 (file)
--- a/src/lib/efreet_base.c
+++ b/src/lib/efreet_base.c
@@ -65,7 +65,7 @@ efreet_base_init(void)
       ("efreet_base", EFREET_DEFAULT_LOG_COLOR);
     if (_efreet_base_log_dom < 0)
     {
-        ERROR("Efreet: Could not create a log domain for efreet_base.\n");
+        ERR("Efreet: Could not create a log domain for efreet_base.\n");
         return 0;
     }
     return 1;

diff --git a/src/lib/efreet_cache.c b/src/lib/efreet_cache.c
index 784d6e2..e35e6ad 100644 (file)
--- a/src/lib/efreet_cache.c
+++ b/src/lib/efreet_cache.c
@@ -602,7 +602,7 @@ efreet_cache_icon_find(Efreet_Icon_Theme *theme, const char *icon)
     if (theme_name && strcmp(theme_name, theme->name.internal))
     {
         /* FIXME: this is bad if people have pointer to this cache, things will go wrong */
-        INFO("theme_name change from `%s` to `%s`", theme_name, theme->name.internal);
+        INF("theme_name change from `%s` to `%s`", theme_name, theme->name.internal);
         IF_RELEASE(theme_name);
         icon_cache = efreet_cache_close(icon_cache);
         eina_hash_free(icons);

diff --git a/src/lib/efreet_desktop.c b/src/lib/efreet_desktop.c
index 486a3b5..681a92c 100644 (file)
--- a/src/lib/efreet_desktop.c
+++ b/src/lib/efreet_desktop.c
@@ -126,7 +126,7 @@ efreet_desktop_init(void)
       ("efreet_desktop", EFREET_DEFAULT_LOG_COLOR);
     if (_efreet_desktop_log_dom < 0)
     {
-        ERROR("Efreet: Could not create a log domain for efreet_desktop");
+        ERR("Efreet: Could not create a log domain for efreet_desktop");
         return 0;
     }
 

diff --git a/src/lib/efreet_icon.c b/src/lib/efreet_icon.c
index cf5c4ad..722ec34 100644 (file)
--- a/src/lib/efreet_icon.c
+++ b/src/lib/efreet_icon.c
@@ -332,7 +332,7 @@ efreet_icon_path_find(const char *theme_name, const char *icon, unsigned int siz
         Efreet_Cache_Icon *cache;
         cache = efreet_cache_icon_find(theme, tmp);
         value = efreet_cache_icon_lookup_icon(cache, size);
-        if (!value) INFO("lookup for `%s` failed in theme `%s` with %p.", icon, theme_name, cache);
+        if (!value) INF("lookup for `%s` failed in theme `%s` with %p.", icon, theme_name, cache);
     }
 
     /* we didn't find the icon in the theme or in the inherited directories
@@ -344,7 +344,7 @@ efreet_icon_path_find(const char *theme_name, const char *icon, unsigned int siz
 
         cache = efreet_cache_icon_fallback_find(tmp);
         value = efreet_cache_icon_fallback_lookup_path(cache);
-        if (!value) INFO("lookup for `%s` failed in fallback too with %p.", icon, cache);
+        if (!value) INF("lookup for `%s` failed in fallback too with %p.", icon, cache);
     }
 
     if (value == NON_EXISTING) value = NULL;

diff --git a/src/lib/efreet_ini.c b/src/lib/efreet_ini.c
index 5d72983..9d1cffb 100644 (file)
--- a/src/lib/efreet_ini.c
+++ b/src/lib/efreet_ini.c
@@ -56,7 +56,7 @@ efreet_ini_init(void)
       ("efreet_init", EFREET_DEFAULT_LOG_COLOR);
     if (_efreet_ini_log_dom < 0)
     {
-        ERROR("Efreet: Could not create a log domain for efreet_init");
+        ERR("Efreet: Could not create a log domain for efreet_init");
         return 0;
     }
     return 1;

diff --git a/src/lib/efreet_menu.c b/src/lib/efreet_menu.c
index db88753..78e361b 100644 (file)
--- a/src/lib/efreet_menu.c
+++ b/src/lib/efreet_menu.c
@@ -475,7 +475,7 @@ efreet_menu_init(void)
       ("efreet_menu", EFREET_DEFAULT_LOG_COLOR);
     if (_efreet_menu_log_dom < 0)
     {
-        ERROR("Efreet: Could not create a log domain for efreet_menu");
+        ERR("Efreet: Could not create a log domain for efreet_menu");
         return 0;
     }
 

diff --git a/src/lib/efreet_mime.c b/src/lib/efreet_mime.c
index c597d4a..97a0775 100644 (file)
--- a/src/lib/efreet_mime.c
+++ b/src/lib/efreet_mime.c
@@ -224,7 +224,7 @@ efreet_mime_init(void)
 
     if (_efreet_mime_log_dom < 0)
     {
-        ERROR("Efreet: Could not create a log domain for efreet_mime.");
+        ERR("Efreet: Could not create a log domain for efreet_mime.");
         goto shutdown_efreet;
     }
 

diff --git a/src/lib/efreet_private.h b/src/lib/efreet_private.h
index 7007ea9..805342b 100644 (file)
--- a/src/lib/efreet_private.h
+++ b/src/lib/efreet_private.h
@@ -74,22 +74,6 @@
 #ifndef EFREET_MODULE_LOG_DOM
 #error "Need to define a log domain"
 #endif
-#ifdef ERROR
-#undef ERROR
-#endif
-#define ERROR(...) EINA_LOG_DOM_ERR(EFREET_MODULE_LOG_DOM, __VA_ARGS__)
-#ifdef DEBUG
-#undef DEBUG
-#endif
-#define DEBUG(...) EINA_LOG_DOM_DBG(EFREET_MODULE_LOG_DOM, __VA_ARGS__)
-#ifdef INFO
-#undef INFO
-#endif
-#define INFO(...) EINA_LOG_DOM_INFO(EFREET_MODULE_LOG_DOM, __VA_ARGS__)
-#ifdef WARN
-#undef WARN
-#endif
-#define WARN(...) EINA_LOG_DOM_WARN(EFREET_MODULE_LOG_DOM, __VA_ARGS__)
 
 /**
  * macros that are used all around the code for message processing

diff --git a/src/lib/efreet_trash.c b/src/lib/efreet_trash.c
index 1cd20b5..7268e8e 100644 (file)
--- a/src/lib/efreet_trash.c
+++ b/src/lib/efreet_trash.c
@@ -45,7 +45,7 @@ efreet_trash_init(void)
       ("efreet_trash", EFREET_DEFAULT_LOG_COLOR);
     if (_efreet_trash_log_dom < 0)
     {
-        ERROR("Efreet: Could not create a log domain for efreet_trash");
+        ERR("Efreet: Could not create a log domain for efreet_trash");
         eina_shutdown();
         return --_efreet_trash_init_count;
     }

diff --git a/src/lib/efreet_utils.c b/src/lib/efreet_utils.c
index 4c110ae..bb4b960 100644 (file)
--- a/src/lib/efreet_utils.c
+++ b/src/lib/efreet_utils.c
@@ -75,7 +75,7 @@ efreet_util_init(void)
       ("efreet_util", EFREET_DEFAULT_LOG_COLOR);
     if (_efreet_utils_log_dom < 0)
     {
-        ERROR("Efreet: Could not create a log domain for efreet_util");
+        ERR("Efreet: Could not create a log domain for efreet_util");
         return 0;
     }
 

diff --git a/src/lib/efreet_xml.c b/src/lib/efreet_xml.c
index 517c7df..281e1c9 100644 (file)
--- a/src/lib/efreet_xml.c
+++ b/src/lib/efreet_xml.c
@@ -56,7 +56,7 @@ efreet_xml_init(void)
     if (_efreet_xml_log_dom < 0)
     {
         _efreet_xml_init_count--;
-        ERROR("Efreet: Could not create a log domain for efreet_xml.");
+        ERR("Efreet: Could not create a log domain for efreet_xml.");
         return _efreet_xml_init_count;
     }
     return _efreet_xml_init_count;