enlightenment
/
enlightenment
5
6
Fork 8
Code Issues 17 Pull Requests Projects Releases Wiki Activity

Correct callback for eina_hash_foreach.

Browse Source 
SVN revision: 37169
devs/princeamd/enlightenment-0.17-elive
Sebastian Dransfeld 15 years ago
parent 4e9fe2ab15
commit 6dc64c5559
12 changed files with 53 additions and 53 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/bin/e_border.c
  2. 4
      src/bin/e_exec.c
  3. 4
      src/bin/e_filereg.c
  4. 16
      src/bin/e_fm_custom.c
  5. 8
      src/bin/e_fm_mime.c
  6. 4
      src/bin/e_font.c
  7. 44
      src/bin/e_int_config_modules.c
  8. 4
      src/bin/e_intl.c
  9. 4
      src/bin/e_manager.c
  10. 4
      src/bin/e_menu.c
  11. 4
      src/bin/e_path.c
  12. 8
      src/bin/e_theme.c

2
src/bin/e_border.c
Unescape View File

@ -2639,7 +2639,7 @@ _e_border_action_input_win_new(E_Border *bd)
return 0;
}
static int
static void
_e_border_action_finish(void)
{
_e_border_action_input_win_del();

4
src/bin/e_exec.c
Unescape View File

@ -47,7 +47,7 @@ static E_Exec_Instance *_e_exec_cb_exec(void *data, Efreet_Desktop *desktop, cha
static int _e_exec_cb_expire_timer(void *data);
static int _e_exec_cb_exit(void *data, int type, void *event);
static Evas_Bool _e_exec_startup_id_pid_find(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *value, void *data);
static Evas_Bool _e_exec_startup_id_pid_find(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *value, void *data);
static void _e_exec_error_dialog(Efreet_Desktop *desktop, const char *exec, Ecore_Exe_Event_Del *event, Ecore_Exe_Event_Data *error, Ecore_Exe_Event_Data *read);
static void _fill_data(E_Config_Dialog_Data *cfdata);
@ -362,7 +362,7 @@ _e_exec_cb_exit(void *data, int type, void *event)
}
static Evas_Bool
_e_exec_startup_id_pid_find(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *value, void *data)
_e_exec_startup_id_pid_find(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *value, void *data)
{
E_Exec_Search *search;
Eina_List *instances, *l;

4
src/bin/e_filereg.c
Unescape View File

@ -18,7 +18,7 @@ struct _Filereg_Item
};
static Evas_Bool _filereg_hash_cb_free(const Evas_Hash *hash __UNUSED__,
const char *key __UNUSED__,
const void *key __UNUSED__,
void *data, void *fdata __UNUSED__);
/* Externally accessible functions */
@ -86,7 +86,7 @@ e_filereg_file_protected(const char *path)
/* Private Functions */
static Evas_Bool
_filereg_hash_cb_free(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
_filereg_hash_cb_free(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__,
void *data, void *fdata __UNUSED__)
{
Filereg_Item *fi;

16
src/bin/e_fm_custom.c
Unescape View File

@ -3,12 +3,12 @@
*/
#include "e.h"
static Evas_Bool _e_fm2_custom_file_hash_foreach_list(const Evas_Hash *hash, const char *key, void *data, void *fdata);
static Evas_Bool _e_fm2_custom_file_hash_foreach_list(const Evas_Hash *hash, const void *key, void *data, void *fdata);
static Eina_List *_e_fm2_custom_hash_key_base_list(Evas_Hash *hash, const char *str);
//static Evas_Bool _e_fm2_custom_file_hash_foreach_sub_list(Evas_Hash *hash, const char *key, void *data, void *fdata);
//static Eina_List *_e_fm2_custom_hash_key_sub_list(Evas_Hash *hash, const char *str);
static Evas_Bool _e_fm2_custom_file_hash_foreach(const Evas_Hash *hash, const char *key, void *data, void *fdata);
static Evas_Bool _e_fm2_custom_file_hash_foreach_save(const Evas_Hash *hash, const char *key, void *data, void *fdata);
static Evas_Bool _e_fm2_custom_file_hash_foreach(const Evas_Hash *hash, const void *key, void *data, void *fdata);
static Evas_Bool _e_fm2_custom_file_hash_foreach_save(const Evas_Hash *hash, const void *key, void *data, void *fdata);
static void _e_fm2_custom_file_info_load(void);
static void _e_fm2_custom_file_info_save(void);
static void _e_fm2_custom_file_info_free(void);
@ -220,7 +220,7 @@ struct _E_Custom_List
};
static Evas_Bool
_e_fm2_custom_file_hash_foreach_list(const Evas_Hash *hash, const char *key, void *data, void *fdata)
_e_fm2_custom_file_hash_foreach_list(const Evas_Hash *hash, const void *key, void *data, void *fdata)
{
struct _E_Custom_List *cl;
@ -245,7 +245,7 @@ _e_fm2_custom_hash_key_base_list(Evas_Hash *hash, const char *str)
/*
static Evas_Bool
_e_fm2_custom_file_hash_foreach_sub_list(const Evas_Hash *hash, const char *key, void *data, void *fdata)
_e_fm2_custom_file_hash_foreach_sub_list(const Evas_Hash *hash, const void *key, void *data, void *fdata)
{
struct _E_Custom_List *cl;
@ -258,7 +258,7 @@ _e_fm2_custom_file_hash_foreach_sub_list(const Evas_Hash *hash, const char *key,
/*
static Eina_List *
_e_fm2_custom_hash_key_sub_list(const Evas_Hash *hash, const char *str)
_e_fm2_custom_hash_key_sub_list(const Evas_Hash *hash, const void *str)
{
struct _E_Custom_List cl;
@ -271,7 +271,7 @@ _e_fm2_custom_hash_key_sub_list(const Evas_Hash *hash, const char *str)
*/
static Evas_Bool
_e_fm2_custom_file_hash_foreach(const Evas_Hash *hash, const char *key, void *data, void *fdata)
_e_fm2_custom_file_hash_foreach(const Evas_Hash *hash, const void *key, void *data, void *fdata)
{
E_Fm2_Custom_File *cf;
@ -283,7 +283,7 @@ _e_fm2_custom_file_hash_foreach(const Evas_Hash *hash, const char *key, void *da
}
static Evas_Bool
_e_fm2_custom_file_hash_foreach_save(const Evas_Hash *hash, const char *key, void *data, void *fdata)
_e_fm2_custom_file_hash_foreach_save(const Evas_Hash *hash, const void *key, void *data, void *fdata)
{
Eet_File *ef;
E_Fm2_Custom_File *cf;

8
src/bin/e_fm_mime.c
Unescape View File

@ -12,8 +12,8 @@ struct _E_Fm2_Mime_Handler_Tuple
};
/* local subsystem functions */
static Evas_Bool _e_fm2_mime_handler_glob_match_foreach(const Evas_Hash *hash __UNUSED__, const char *key, void *data, void *fdata);
static Evas_Bool _e_fm_mime_icon_foreach(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata);
static Evas_Bool _e_fm2_mime_handler_glob_match_foreach(const Evas_Hash *hash __UNUSED__, const void *key, void *data, void *fdata);
static Evas_Bool _e_fm_mime_icon_foreach(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata);
static Evas_Hash *icon_map = NULL;
static Evas_Hash *_mime_handlers = NULL;
@ -356,7 +356,7 @@ e_fm2_mime_handler_test(E_Fm2_Mime_Handler *handler, Evas_Object *obj, const cha
/* local subsystem functions */
/* used to loop a glob hash and determine if the glob handler matches the filename */
static Evas_Bool
_e_fm2_mime_handler_glob_match_foreach(const Evas_Hash *hash __UNUSED__, const char *key, void *data, void *fdata)
_e_fm2_mime_handler_glob_match_foreach(const Evas_Hash *hash __UNUSED__, const void *key, void *data, void *fdata)
{
E_Fm2_Mime_Handler_Tuple *tuple;
Eina_List *handlers = NULL;
@ -377,7 +377,7 @@ _e_fm2_mime_handler_glob_match_foreach(const Evas_Hash *hash __UNUSED__, const c
}
static Evas_Bool
_e_fm_mime_icon_foreach(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata)
_e_fm_mime_icon_foreach(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata)
{
Eina_List **freelist;

4
src/bin/e_font.c
Unescape View File

@ -5,7 +5,7 @@
#define E_TOK_STYLE ":style="
static Evas_Bool _font_hash_free_cb(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata __UNUSED__);
static Evas_Bool _font_hash_free_cb(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__);
static Evas_Hash *_e_font_available_hash_add(Evas_Hash *font_hash, const char *full_name);
static E_Font_Properties *_e_font_fontconfig_name_parse(Evas_Hash **font_hash, E_Font_Properties *efp, const char *font);
static char _fn_buf[1024];
@ -151,7 +151,7 @@ e_font_properties_free(E_Font_Properties *efp)
}
static Evas_Bool
_font_hash_free_cb(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata __UNUSED__)
_font_hash_free_cb(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__)
{
E_Font_Properties *efp;

44
src/bin/e_int_config_modules.c
Unescape View File

@ -57,24 +57,24 @@ static void _fill_type_hash (void);
static void _load_modules (const char *dir);
static void _fill_list (Evas_Object *obj, int enabled);
static Evas_Bool _fill_list_types_avail(const Evas_Hash *hash __UNUSED__,
const char *key __UNUSED__,
const void *key __UNUSED__,
void *data, void *fdata);
static Evas_Bool _fill_list_types_load (const Evas_Hash *hash __UNUSED__,
const char *key __UNUSED__,
const void *key __UNUSED__,
void *data, void *fdata);
static Evas_Bool _fill_list_types (Evas_Object *obj, CFType *cft,
int enabled);
static Evas_Bool _types_hash_cb_free (const Evas_Hash *hash __UNUSED__,
const char *key __UNUSED__,
const void *key __UNUSED__,
void *data, void *fdata __UNUSED__);
static Evas_Bool _mod_hash_cb_free (const Evas_Hash *hash __UNUSED__,
const char *key __UNUSED__,
const void *key __UNUSED__,
void *data, void *fdata __UNUSED__);
static Evas_Bool _mod_hash_avail_list (const Evas_Hash *hash __UNUSED__,
const char *key __UNUSED__,
const void *key __UNUSED__,
void *data, void *fdata);
static Evas_Bool _mod_hash_load_list (const Evas_Hash *hash __UNUSED__,
const char *key __UNUSED__,
const void *key __UNUSED__,
void *data, void *fdata);
static int _mod_list_sort (void *data1, void *data2);
static void _list_widget_load (Evas_Object *obj, Eina_List *list);
@ -82,23 +82,23 @@ static void _avail_list_cb_change (void *data, Evas_Object *obj);
static void _load_list_cb_change (void *data, Evas_Object *obj);
static void _unselect_all_modules (void);
static Evas_Bool _mod_hash_unselect (const Evas_Hash *hash __UNUSED__,
const char *key __UNUSED__,
const void *key __UNUSED__,
void *data, void *fdata __UNUSED__);
static void _select_all_modules (Evas_Object *obj, void *data);
static void _btn_cb_unload (void *data, void *data2);
static void _btn_cb_load (void *data, void *data2);
static Evas_Bool _mod_hash_load (const Evas_Hash *hash __UNUSED__,
const char *key __UNUSED__,
const void *key __UNUSED__,
void *data, void *fdata __UNUSED__);
static Evas_Bool _mod_hash_unload (const Evas_Hash *hash __UNUSED__,
const char *key __UNUSED__,
const void *key __UNUSED__,
void *data, void *fdata __UNUSED__);
static void _enable_modules (int enable);
static Evas_Bool _enable_modules_types_enable (const Evas_Hash *hash __UNUSED__,
const char *key __UNUSED__,
const void *key __UNUSED__,
void *data, void *fdata);
static Evas_Bool _enable_modules_types_disable (const Evas_Hash *hash __UNUSED__,
const char *key __UNUSED__,
const void *key __UNUSED__,
void *data, void *fdata);
/* local variables */
@ -344,7 +344,7 @@ _fill_list(Evas_Object *obj, int enabled)
static Evas_Bool
_fill_list_types_avail(const Evas_Hash *hash __UNUSED__,
const char *key __UNUSED__, void *data, void *fdata)
const void *key __UNUSED__, void *data, void *fdata)
{
CFType *cft;
Evas_Object *obj;
@ -357,7 +357,7 @@ _fill_list_types_avail(const Evas_Hash *hash __UNUSED__,
static Evas_Bool
_fill_list_types_load(const Evas_Hash *hash __UNUSED__,
const char *key __UNUSED__, void *data, void *fdata)
const void *key __UNUSED__, void *data, void *fdata)
{
CFType *cft;
Evas_Object *obj;
@ -413,7 +413,7 @@ _fill_list_types(Evas_Object *obj, CFType *cft, int enabled)
}
static Evas_Bool
_types_hash_cb_free(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
_types_hash_cb_free(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__,
void *data, void *fdata __UNUSED__)
{
CFType *type = NULL;
@ -433,7 +433,7 @@ _types_hash_cb_free(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__
}
static Evas_Bool
_mod_hash_cb_free(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
_mod_hash_cb_free(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__,
void *data, void *fdata __UNUSED__)
{
CFModule *mod = NULL;
@ -449,7 +449,7 @@ _mod_hash_cb_free(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
}
static Evas_Bool
_mod_hash_avail_list(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
_mod_hash_avail_list(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__,
void *data, void *fdata)
{
Eina_List **l;
@ -463,7 +463,7 @@ _mod_hash_avail_list(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED_
}
static Evas_Bool
_mod_hash_load_list(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
_mod_hash_load_list(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__,
void *data, void *fdata)
{
Eina_List **l;
@ -587,7 +587,7 @@ _unselect_all_modules(void)
}
static Evas_Bool
_mod_hash_unselect(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
_mod_hash_unselect(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__,
void *data, void *fdata __UNUSED__)
{
CFModule *mod = NULL;
@ -687,7 +687,7 @@ _enable_modules(int enable)
static Evas_Bool
_enable_modules_types_enable(const Evas_Hash *hash __UNUSED__,
const char *key __UNUSED__, void *data,
const void *key __UNUSED__, void *data,
void *fdata)
{
CFType *cft;
@ -700,7 +700,7 @@ _enable_modules_types_enable(const Evas_Hash *hash __UNUSED__,
static Evas_Bool
_enable_modules_types_disable(const Evas_Hash *hash __UNUSED__,
const char *key __UNUSED__, void *data,
const void *key __UNUSED__, void *data,
void *fdata)
{
CFType *cft;
@ -712,7 +712,7 @@ _enable_modules_types_disable(const Evas_Hash *hash __UNUSED__,
}
static Evas_Bool
_mod_hash_load(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
_mod_hash_load(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__,
void *data, void *fdata __UNUSED__)
{
CFModule *mod = NULL;
@ -729,7 +729,7 @@ _mod_hash_load(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
}
static Evas_Bool
_mod_hash_unload(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
_mod_hash_unload(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__,
void *data, void *fdata __UNUSED__)
{
CFModule *mod = NULL;

4
src/bin/e_intl.c
Unescape View File

@ -47,7 +47,7 @@ static Eina_List *_e_intl_locale_system_locales_get(void);
static Eina_List *_e_intl_locale_search_order_get(const char *locale);
static int _e_intl_locale_validate(const char *locale);
static void _e_intl_locale_hash_free(Evas_Hash *language_hash);
static Evas_Bool _e_intl_locale_hash_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata);
static Evas_Bool _e_intl_locale_hash_free_cb(const Evas_Hash *hash, const void *key, void *data, void *fdata);
/* Input Method Configuration and Management */
static int _e_intl_cb_exit(void *data, int type, void *event);
@ -451,7 +451,7 @@ _e_intl_locale_hash_free(Evas_Hash *locale_hash)
}
static Evas_Bool
_e_intl_locale_hash_free_cb(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata __UNUSED__)
_e_intl_locale_hash_free_cb(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__)
{
free(data);
return 1;

4
src/bin/e_manager.c
Unescape View File

@ -16,7 +16,7 @@ static int _e_manager_cb_screensaver_notify(void *data, int ev_type, void *ev);
static int _e_manager_cb_client_message(void *data, int ev_type, void *ev);
static Evas_Bool _e_manager_frame_extents_free_cb(const Evas_Hash *hash __UNUSED__,
const char *key __UNUSED__,
const void *key __UNUSED__,
void *data, void *fdata __UNUSED__);
static E_Manager *_e_manager_get_for_root(Ecore_X_Window root);
#if 0 /* use later - maybe */
@ -856,7 +856,7 @@ _e_manager_cb_client_message(void *data, int ev_type, void *ev)
}
static Evas_Bool
_e_manager_frame_extents_free_cb(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
_e_manager_frame_extents_free_cb(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__,
void *data, void *fdata __UNUSED__)
{
free(data);

4
src/bin/e_menu.c
Unescape View File

@ -86,7 +86,7 @@ static int _e_menu_cb_scroll_animator (void *data);
static int _e_menu_cb_window_shape (void *data, int ev_type, void *ev);
static void _e_menu_cb_item_submenu_post_default (void *data, E_Menu *m, E_Menu_Item *mi);
static Evas_Bool _e_menu_categories_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata);
static Evas_Bool _e_menu_categories_free_cb(const Evas_Hash *hash, const void *key, void *data, void *fdata);
/* local subsystem globals */
static Ecore_X_Window _e_menu_win = 0;
@ -2875,7 +2875,7 @@ _e_menu_cb_item_submenu_post_default(void *data, E_Menu *m, E_Menu_Item *mi)
static Evas_Bool
_e_menu_categories_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata)
_e_menu_categories_free_cb(const Evas_Hash *hash, const void *key, void *data, void *fdata)
{
Eina_List *l;
E_Menu_Category *cat;

4
src/bin/e_path.c
Unescape View File

@ -6,7 +6,7 @@
/* local subsystem functions */
static void _e_path_free(E_Path *ep);
static void _e_path_cache_free(E_Path *ep);
static Evas_Bool _e_path_cache_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata);
static Evas_Bool _e_path_cache_free_cb(const Evas_Hash *hash, const void *key, void *data, void *fdata);
/* externally accessible functions */
EAPI E_Path *
@ -387,7 +387,7 @@ _e_path_cache_free(E_Path *ep)
}
static Evas_Bool
_e_path_cache_free_cb(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata __UNUSED__)
_e_path_cache_free_cb(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__)
{
eina_stringshare_del(data);
return 1;

8
src/bin/e_theme.c
Unescape View File

@ -13,8 +13,8 @@ struct _E_Theme_Result
Evas_Hash *quickfind;
};
static Evas_Bool _e_theme_mappings_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata);
static Evas_Bool _e_theme_mappings_quickfind_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata);
static Evas_Bool _e_theme_mappings_free_cb(const Evas_Hash *hash, const void *key, void *data, void *fdata);
static Evas_Bool _e_theme_mappings_quickfind_free_cb(const Evas_Hash *hash, const void *key, void *data, void *fdata);
static void _e_theme_category_register(const char *category);
static Eina_List *_e_theme_collection_item_register(Eina_List *list, const char *name);
static Eina_List *_e_theme_collection_items_find(const char *base, const char *collname);
@ -495,7 +495,7 @@ e_theme_handler_test(Evas_Object *obj, const char *path, void *data)
/* local subsystem functions */
static Evas_Bool
_e_theme_mappings_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata)
_e_theme_mappings_free_cb(const Evas_Hash *hash, const void *key, void *data, void *fdata)
{
E_Theme_Result *res;
@ -512,7 +512,7 @@ _e_theme_mappings_free_cb(const Evas_Hash *hash, const char *key, void *data, vo
}
static Evas_Bool
_e_theme_mappings_quickfind_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata)
_e_theme_mappings_quickfind_free_cb(const Evas_Hash *hash, const void *key, void *data, void *fdata)
{
eina_stringshare_del(key);
return 1;

Write Preview
Loading…
Cancel
Save