From: Enlightenment S. <no-...@en...> - 2011-02-05 19:07:13
|
Log: Remove duplicate logging macros Author: englebass Date: 2011-02-05 11:07:07 -0800 (Sat, 05 Feb 2011) New Revision: 56732 Trac: http://trac.enlightenment.org/e/changeset/56732 Modified: trunk/efreet/ChangeLog trunk/efreet/src/lib/efreet_base.c trunk/efreet/src/lib/efreet_cache.c trunk/efreet/src/lib/efreet_desktop.c trunk/efreet/src/lib/efreet_icon.c trunk/efreet/src/lib/efreet_ini.c trunk/efreet/src/lib/efreet_menu.c trunk/efreet/src/lib/efreet_mime.c trunk/efreet/src/lib/efreet_private.h trunk/efreet/src/lib/efreet_trash.c trunk/efreet/src/lib/efreet_utils.c trunk/efreet/src/lib/efreet_xml.c Modified: trunk/efreet/ChangeLog =================================================================== --- trunk/efreet/ChangeLog 2011-02-05 19:06:55 UTC (rev 56731) +++ trunk/efreet/ChangeLog 2011-02-05 19:07:07 UTC (rev 56732) @@ -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 Modified: trunk/efreet/src/lib/efreet_base.c =================================================================== --- trunk/efreet/src/lib/efreet_base.c 2011-02-05 19:06:55 UTC (rev 56731) +++ trunk/efreet/src/lib/efreet_base.c 2011-02-05 19:07:07 UTC (rev 56732) @@ -65,7 +65,7 @@ ("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; Modified: trunk/efreet/src/lib/efreet_cache.c =================================================================== --- trunk/efreet/src/lib/efreet_cache.c 2011-02-05 19:06:55 UTC (rev 56731) +++ trunk/efreet/src/lib/efreet_cache.c 2011-02-05 19:07:07 UTC (rev 56732) @@ -602,7 +602,7 @@ 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); Modified: trunk/efreet/src/lib/efreet_desktop.c =================================================================== --- trunk/efreet/src/lib/efreet_desktop.c 2011-02-05 19:06:55 UTC (rev 56731) +++ trunk/efreet/src/lib/efreet_desktop.c 2011-02-05 19:07:07 UTC (rev 56732) @@ -126,7 +126,7 @@ ("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; } Modified: trunk/efreet/src/lib/efreet_icon.c =================================================================== --- trunk/efreet/src/lib/efreet_icon.c 2011-02-05 19:06:55 UTC (rev 56731) +++ trunk/efreet/src/lib/efreet_icon.c 2011-02-05 19:07:07 UTC (rev 56732) @@ -332,7 +332,7 @@ 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 @@ 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; Modified: trunk/efreet/src/lib/efreet_ini.c =================================================================== --- trunk/efreet/src/lib/efreet_ini.c 2011-02-05 19:06:55 UTC (rev 56731) +++ trunk/efreet/src/lib/efreet_ini.c 2011-02-05 19:07:07 UTC (rev 56732) @@ -56,7 +56,7 @@ ("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; Modified: trunk/efreet/src/lib/efreet_menu.c =================================================================== --- trunk/efreet/src/lib/efreet_menu.c 2011-02-05 19:06:55 UTC (rev 56731) +++ trunk/efreet/src/lib/efreet_menu.c 2011-02-05 19:07:07 UTC (rev 56732) @@ -475,7 +475,7 @@ ("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; } Modified: trunk/efreet/src/lib/efreet_mime.c =================================================================== --- trunk/efreet/src/lib/efreet_mime.c 2011-02-05 19:06:55 UTC (rev 56731) +++ trunk/efreet/src/lib/efreet_mime.c 2011-02-05 19:07:07 UTC (rev 56732) @@ -224,7 +224,7 @@ 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; } Modified: trunk/efreet/src/lib/efreet_private.h =================================================================== --- trunk/efreet/src/lib/efreet_private.h 2011-02-05 19:06:55 UTC (rev 56731) +++ trunk/efreet/src/lib/efreet_private.h 2011-02-05 19:07:07 UTC (rev 56732) @@ -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 Modified: trunk/efreet/src/lib/efreet_trash.c =================================================================== --- trunk/efreet/src/lib/efreet_trash.c 2011-02-05 19:06:55 UTC (rev 56731) +++ trunk/efreet/src/lib/efreet_trash.c 2011-02-05 19:07:07 UTC (rev 56732) @@ -45,7 +45,7 @@ ("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; } Modified: trunk/efreet/src/lib/efreet_utils.c =================================================================== --- trunk/efreet/src/lib/efreet_utils.c 2011-02-05 19:06:55 UTC (rev 56731) +++ trunk/efreet/src/lib/efreet_utils.c 2011-02-05 19:07:07 UTC (rev 56732) @@ -75,7 +75,7 @@ ("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; } Modified: trunk/efreet/src/lib/efreet_xml.c =================================================================== --- trunk/efreet/src/lib/efreet_xml.c 2011-02-05 19:06:55 UTC (rev 56731) +++ trunk/efreet/src/lib/efreet_xml.c 2011-02-05 19:07:07 UTC (rev 56732) @@ -56,7 +56,7 @@ 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; |