englebass pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=b624345bbd577cfee7746abef0cb0595dbd9b72b
commit b624345bbd577cfee7746abef0cb0595dbd9b72b Author: Sebastian Dransfeld <[email protected]> Date: Mon Sep 29 09:39:17 2014 +0200 efreet: improve messages --- src/lib/efreet/efreet_cache.c | 14 +++++------ src/lib/efreet/efreet_desktop.c | 7 +++--- src/lib/efreet/efreet_desktop_command.c | 4 ++-- src/lib/efreet/efreet_icon.c | 6 ++--- src/lib/efreet/efreet_ini.c | 4 ++-- src/lib/efreet/efreet_menu.c | 42 ++++++++++++++++++++------------- src/lib/efreet/efreet_trash.c | 8 +++---- src/lib/efreet/efreet_xml.c | 2 +- 8 files changed, 48 insertions(+), 39 deletions(-) diff --git a/src/lib/efreet/efreet_cache.c b/src/lib/efreet/efreet_cache.c index 23c9e44..2742545 100644 --- a/src/lib/efreet/efreet_cache.c +++ b/src/lib/efreet/efreet_cache.c @@ -665,7 +665,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 */ - INF("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); @@ -824,13 +824,13 @@ efreet_cache_desktop_find(const char *file) /* If less than one second since last stat, return desktop */ if ((ecore_time_get() - cache->check_time) < 1) { - INF("Return without stat %f %f", ecore_time_get(), cache->check_time); + INF("Return without stat %f %f for file '%s'", ecore_time_get(), cache->check_time, file); eina_lock_release(&_lock); return &cache->desktop; } if (cache->desktop.load_time == ecore_file_mod_time(cache->desktop.orig_path)) { - INF("Return with stat %f %f", ecore_time_get(), cache->check_time); + INF("Return with stat %f %f for file '%s'", ecore_time_get(), cache->check_time, file); cache->check_time = ecore_time_get(); eina_lock_release(&_lock); return &cache->desktop; @@ -848,7 +848,7 @@ efreet_cache_desktop_find(const char *file) if (cache->desktop.load_time != ecore_file_mod_time(cache->desktop.orig_path)) { /* Don't return stale data */ - INF("We got stale data in the desktop cache"); + INF("We got stale data in the desktop cache for file '%s'", cache->desktop.orig_path); efreet_cache_desktop_free(&cache->desktop); eina_hash_set(desktops, file, NON_EXISTING); } @@ -883,7 +883,7 @@ efreet_cache_desktop_free(Efreet_Desktop *desktop) curr = eina_hash_find(desktops, desktop->orig_path); if (curr == desktop) { - INF("Found in current cache, purge\n"); + INF("Found '%s' in current cache, purge", desktop->orig_path); eina_hash_del_by_key(desktops, desktop->orig_path); } @@ -892,11 +892,11 @@ efreet_cache_desktop_free(Efreet_Desktop *desktop) curr = eina_hash_find(d->hash, desktop->orig_path); if (curr == desktop) { - INF("Found in old cache, purge\n"); + INF("Found '%s' in old cache, purge", desktop->orig_path); eina_hash_del_by_key(d->hash, desktop->orig_path); if (eina_hash_population(d->hash) == 0) { - INF("Cache empty, close file\n"); + INF("Cache empty, close file"); eina_hash_free(d->hash); eet_close(d->ef); free(d); diff --git a/src/lib/efreet/efreet_desktop.c b/src/lib/efreet/efreet_desktop.c index f857de8..2645c94 100644 --- a/src/lib/efreet/efreet_desktop.c +++ b/src/lib/efreet/efreet_desktop.c @@ -571,8 +571,7 @@ efreet_desktop_string_list_parse(const char *string) if (*s) { #ifdef STRICT_SPEC - WRN("[Efreet]: Found a string list without ';' " - "at the end: %s", string); + WRN("Found a string list without ';' at the end: '%s'", string); #endif list = eina_list_append(list, (void *)eina_stringshare_add(s)); } @@ -644,7 +643,7 @@ efreet_desktop_read(Efreet_Desktop *desktop) if (!ok) ok = efreet_ini_section_set(ini, "KDE Desktop Entry"); if (!ok) { - ERR("efreet_desktop_new error: no Desktop Entry section"); + ERR("no Desktop Entry section in file '%s'", desktop->orig_path); error = 1; } @@ -957,7 +956,7 @@ efreet_desktop_generic_fields_parse(Efreet_Desktop *desktop, Efreet_Ini *ini) if (val) desktop->name = strdup(val); else { - ERR("efreet_desktop_generic_fields_parse error: no Name or _Name fields"); + ERR("no Name or _Name fields in file '%s'", desktop->orig_path); return 0; } diff --git a/src/lib/efreet/efreet_desktop_command.c b/src/lib/efreet/efreet_desktop_command.c index c6c8d18..2748d0c 100644 --- a/src/lib/efreet/efreet_desktop_command.c +++ b/src/lib/efreet/efreet_desktop_command.c @@ -403,7 +403,7 @@ efreet_desktop_command_build(Efreet_Desktop_Command *command) break; case 'v': case 'm': - WRN("[Efreet]: Deprecated conversion char: '%c' in file '%s'", + WRN("Deprecated conversion char: '%c' in file '%s'", *p, command->desktop->orig_path); break; case '%': @@ -411,7 +411,7 @@ efreet_desktop_command_build(Efreet_Desktop_Command *command) break; default: #ifdef STRICT_SPEC - WRN("[Efreet_desktop]: Unknown conversion character: '%c'", *p); + WRN("Unknown conversion character: '%c' in file '%s'", *p, command->desktop->orig_path); #endif break; } diff --git a/src/lib/efreet/efreet_icon.c b/src/lib/efreet/efreet_icon.c index 70e7fca..4ad8a6b 100644 --- a/src/lib/efreet/efreet_icon.c +++ b/src/lib/efreet/efreet_icon.c @@ -197,7 +197,7 @@ efreet_icon_remove_extension(const char *icon) if (!strcmp(ext, ext2)) { #ifdef STRICT_SPEC - WRN("[Efreet]: Requesting an icon with an extension: %s", + WRN("Requesting an icon with an extension: %s", icon); #endif *ext = '\0'; @@ -232,7 +232,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_icon_lookup_icon(cache, size); - if (!value) INF("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 @@ -244,7 +244,7 @@ efreet_icon_path_find(const char *theme_name, const char *icon, unsigned int siz cache = efreet_cache_icon_fallback_find(tmp); value = efreet_icon_fallback_lookup_path(cache); - if (!value) INF("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); } #ifdef SLOPPY_SPEC diff --git a/src/lib/efreet/efreet_ini.c b/src/lib/efreet/efreet_ini.c index fec11c3..dc35d85 100644 --- a/src/lib/efreet/efreet_ini.c +++ b/src/lib/efreet/efreet_ini.c @@ -143,7 +143,7 @@ efreet_ini_parse(const char *file) if (!section) { - INF("Invalid file (%s) (missing section)", file); + INF("Invalid file '%s' (missing section)", file); goto error; } @@ -207,7 +207,7 @@ efreet_ini_parse(const char *file) else { /* invalid file... */ - INF("Invalid file (%s) (missing = from key=value pair)", file); + INF("Invalid file '%s' (missing = from key=value pair)", file); goto error; } } diff --git a/src/lib/efreet/efreet_menu.c b/src/lib/efreet/efreet_menu.c index 0bd69eb..ada789b 100644 --- a/src/lib/efreet/efreet_menu.c +++ b/src/lib/efreet/efreet_menu.c @@ -625,7 +625,7 @@ efreet_menu_parse(const char *path) /* make sure we've got a <Menu> to start with */ if (xml->tag != efreet_tag_menu) { - WRN("Efreet_menu: Menu file didn't start with <Menu> tag."); + WRN("Menu file didn't start with <Menu> tag: '%s'", path); efreet_xml_del(xml); return NULL; } @@ -875,7 +875,7 @@ efreet_menu_handle_menu(Efreet_Menu_Internal *internal, Efreet_Xml *xml) } else { - WRN("Unknown XML tag: %s", child->tag); + WRN("Unknown XML tag '%s' in file '%s/%s'", child->tag, internal->file.path, internal->file.name); return 0; } } @@ -1068,7 +1068,7 @@ efreet_menu_handle_name(Efreet_Menu_Internal *parent, Efreet_Xml *xml) /* not allowed to have two Name settings in a menu */ if (parent->name.internal) { - INF("efreet_menu_handle_name() setting second name into menu"); + INF("efreet_menu_handle_name() setting second name into menu: '%s/%s'", parent->file.path, parent->file.name); return 0; } /* ignore the name if it is empty */ @@ -1351,7 +1351,7 @@ efreet_menu_handle_merge_file(Efreet_Menu_Internal *parent, Efreet_Xml *xml) if (!parent->file.path) { - INF("efreet_menu_handle_merge_file() missing menu path ..."); + INF("efreet_menu_handle_merge_file() missing menu path ... '%s'", parent->file.name); return 0; } @@ -1443,7 +1443,7 @@ efreet_menu_merge(Efreet_Menu_Internal *parent, Efreet_Xml *xml, const char *pat if (!merge_xml) { INF("efreet_menu_merge() failed to read in the " - "merge file (%s)", path); + "merge file '%s'", path); return 0; } @@ -1855,7 +1855,8 @@ efreet_menu_handle_move(Efreet_Menu_Internal *parent, Efreet_Xml *xml) else { INF("efreet_menu_handle_move() unknown tag found " - "in Move (%s)", child->tag); + "in Move '%s' in file '%s/%s'", child->tag, + parent->file.path, parent->file.name); return 0; } } @@ -1882,7 +1883,8 @@ efreet_menu_handle_old(Efreet_Menu_Internal *parent, Efreet_Xml *xml) if (parent->current_move) { INF("efreet_menu_handle_old() saw second <Old> " - "before seeing <New>"); + "before seeing <New> in file '%s/%s'", + parent->file.path, parent->file.name); return 0; } @@ -1922,7 +1924,8 @@ efreet_menu_handle_new(Efreet_Menu_Internal *parent, Efreet_Xml *xml) if (!parent->current_move) { - INF("efreet_menu_handle_new() saw New before seeing Old"); + INF("efreet_menu_handle_new() saw New before seeing Old in '%s/%s'", + parent->file.path, parent->file.name); return 0; } @@ -1965,7 +1968,8 @@ efreet_menu_handle_layout(Efreet_Menu_Internal *parent, Efreet_Xml *xml) else { INF("efreet_menu_handle_move() unknown tag found " - "in Layout (%s)", child->tag); + "in Layout '%s' in file '%s/%s'", child->tag, + parent->file.path, parent->file.name); return 0; } } @@ -2022,7 +2026,8 @@ efreet_menu_handle_default_layout(Efreet_Menu_Internal *parent, Efreet_Xml *xml) else { INF("efreet_menu_handle_move() unknown tag found in " - "DefaultLayout (%s)", child->tag); + "DefaultLayout '%s' in file '%s/%s'", child->tag, + parent->file.path, parent->file.name); return 0; } } @@ -2041,7 +2046,8 @@ efreet_menu_handle_layout_menuname(Efreet_Menu_Internal *parent, Efreet_Xml *xml if (!xml->text) { INF("efreet_menu_handle_layout_menuname() The Menuname tag in " - "layout needs a filename."); + "layout needs a filename in file '%s/%s'", + parent->file.path, parent->file.name); return 0; } @@ -2080,7 +2086,8 @@ efreet_menu_handle_layout_filename(Efreet_Menu_Internal *parent, Efreet_Xml *xml if (!xml->text) { INF("efreet_menu_handle_layout_filename() The Filename tag in " - "layout needs a filename."); + "layout needs a filename in file '%s/%s'", + parent->file.path, parent->file.name); return 0; } @@ -2122,14 +2129,16 @@ efreet_menu_handle_layout_merge(Efreet_Menu_Internal *parent, Efreet_Xml *xml, i if (!attr) { INF("efreet_menu_handle_layout_merge() The Merge tag in layout " - "needs a type attribute."); + "needs a type attribute in file '%s/%s'", + parent->file.path, parent->file.name); return 0; } if (strcmp(attr, "files") && strcmp(attr, "menus") && strcmp(attr, "all")) { INF("efreet_menu_handle_layout_merge() The type attribute for " - "the Merge tag contains an unknown value (%s).", attr); + "the Merge tag contains an unknown value '%s' in file '%s/%s'", + attr, parent->file.path, parent->file.name); return 0; } @@ -2201,7 +2210,8 @@ efreet_menu_handle_filter_op(Efreet_Menu_Filter_Op *op, Efreet_Xml *xml) } else { - INF("efreet_menu_handle_filter_op() unknown tag in filter (%s)", child->tag); + INF("efreet_menu_handle_filter_op() unknown tag in filter '%s'", + child->tag); return 0; } } @@ -3152,7 +3162,7 @@ efreet_menu_path_get(Efreet_Menu_Internal *internal, const char *suffix) { if (!internal->file.path) { - INF("efreet_menu_handle_app_dir() missing menu path ..."); + INF("efreet_menu_handle_app_dir() missing menu path ... '%s'", internal->file.name); return NULL; } snprintf(path, sizeof(path), "%s/%s", internal->file.path, suffix); diff --git a/src/lib/efreet/efreet_trash.c b/src/lib/efreet/efreet_trash.c index e759247..50a273b 100644 --- a/src/lib/efreet/efreet_trash.c +++ b/src/lib/efreet/efreet_trash.c @@ -174,7 +174,7 @@ efreet_trash_delete_uri(Efreet_Uri *uri, int force_delete) trash_dir = efreet_trash_dir_get(uri->path); if (!trash_dir) { - ERR("EFREET TRASH ERROR: No trash directory."); + ERR("No trash directory for file '%s'", uri->path); return 0; } snprintf(dest, sizeof(dest), "%s/files/%s", trash_dir, fname); @@ -199,14 +199,14 @@ efreet_trash_delete_uri(Efreet_Uri *uri, int force_delete) if (!ecore_file_recursive_rm(uri->path)) { - ERR("EFREET TRASH ERROR: Can't delete file."); + ERR("Can't delete file '%s'", uri->path); eina_stringshare_del(trash_dir); return 0; } } else { - ERR("EFREET TRASH ERROR: Can't move file to trash."); + ERR("Can't move file to trash '%s'", uri->path); eina_stringshare_del(trash_dir); return 0; } @@ -233,7 +233,7 @@ efreet_trash_delete_uri(Efreet_Uri *uri, int force_delete) } else { - ERR("EFREET TRASH ERROR: Can't create trash info file."); + ERR("Can't create trash info file '%s'", dest); return 0; } diff --git a/src/lib/efreet/efreet_xml.c b/src/lib/efreet/efreet_xml.c index 35823bb..ed31774 100644 --- a/src/lib/efreet/efreet_xml.c +++ b/src/lib/efreet/efreet_xml.c @@ -113,7 +113,7 @@ efreet_xml_new(const char *file) return xml; efreet_error: - ERR("could not parse xml file"); + ERR("could not parse xml file '%s'", file); if (data != MAP_FAILED) munmap(data, size); if (fd != -1) close(fd); if (xml) efreet_xml_del(xml); --
