kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

efreet_menu: remove unused and unreachable code. 

Coverity doesn't like this unreachable code. This purges
efreet_menu of all unused code for the deprecated and
non-working menu_async methods. The warnings remain
at compile time and run time.
Differential Revision: https://phab.enlightenment.org/D7101
This commit is contained in:
Alastair Poole 2018-09-24 10:26:23 +00:00 committed by Marcel Hollerbach
parent 0e41b59f6d
commit c0b672db9c
1 changed files with 2 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/lib/efreet/efreet_menu.c
View File

@ -319,9 +319,6 @@ static void efreet_menu_path_set(Efreet_Menu_Internal *internal, const char *pat
static int efreet_menu_save_menu(Efreet_Menu *menu, FILE *f, int indent);
static int efreet_menu_save_indent(FILE *f, int indent);
static void _efreet_menu_async_parse_cb(void *data, Ecore_Thread *thread);
static void _efreet_menu_async_end_cb(void *data, Ecore_Thread *thread);
int
efreet_menu_init(void)
{
@ -530,43 +527,11 @@ efreet_menu_file_set(const char *file)
/* deprecated */
EFREET_DEPRECATED_API EAPI void
efreet_menu_async_get(Efreet_Menu_Cb func, const void *data)
efreet_menu_async_get(Efreet_Menu_Cb func EINA_UNUSED, const void *data EINA_UNUSED)
{
char menu[PATH_MAX];
const char *dir;
Eina_List *config_dirs, *l;
ERR("%s is deprecated and shouldn't be called", __FUNCTION__);
return;
if (!func) return;
#ifndef STRICT_SPEC
/* prefer user set menu */
if (efreet_menu_file)
{
if (ecore_file_exists(efreet_menu_file))
efreet_menu_async_parse(efreet_menu_file, func, data);
}
#endif
/* check the users config directory first */
snprintf(menu, sizeof(menu), "%s/menus/%sapplications.menu",
efreet_config_home_get(), efreet_menu_prefix);
if (ecore_file_exists(menu))
efreet_menu_async_parse(menu, func, data);
/* fallback to the XDG_CONFIG_DIRS */
config_dirs = efreet_config_dirs_get();
EINA_LIST_FOREACH(config_dirs, l, dir)
{
snprintf(menu, sizeof(menu), "%s/menus/%sapplications.menu",
dir, efreet_menu_prefix);
if (ecore_file_exists(menu))
efreet_menu_async_parse(menu, func, data);
}
}
EAPI Efreet_Menu *
@ -606,18 +571,11 @@ efreet_menu_get(void)
/* deprecated */
EFREET_DEPRECATED_API EAPI void
efreet_menu_async_parse(const char *path, Efreet_Menu_Cb func, const void *data)
efreet_menu_async_parse(const char *path EINA_UNUSED, Efreet_Menu_Cb func EINA_UNUSED, const void *data EINA_UNUSED)
{
Efreet_Menu_Async *async;
ERR("%s is deprecated and shouldn't be called", __FUNCTION__);
return;
async = NEW(Efreet_Menu_Async, 1);
async->func = func;
async->data = (void*)data;
async->path = eina_stringshare_add(path);
ecore_thread_run(_efreet_menu_async_parse_cb, _efreet_menu_async_end_cb, NULL, async);
}
EAPI Efreet_Menu *
@ -3925,20 +3883,3 @@ efreet_menu_save_indent(FILE *f, int indent)
return 1;
}
static void
_efreet_menu_async_parse_cb(void *data, Ecore_Thread *thread EINA_UNUSED)
{
Efreet_Menu_Async *async = data;
async->menu = efreet_menu_parse(async->path);
}
static void
_efreet_menu_async_end_cb(void *data, Ecore_Thread *thread EINA_UNUSED)
{
Efreet_Menu_Async *async = data;
async->func(async->data, async->menu);
eina_stringshare_del(async->path);
free(async);
}