diff --git a/src/bin/e.h b/src/bin/e.h index 53ba86c9c..bbe427665 100644 --- a/src/bin/e.h +++ b/src/bin/e.h @@ -164,20 +164,16 @@ typedef struct _E_Rect E_Rect; # define E_NEW(s, n) (s *)calloc(n, sizeof(s)) # define E_NEW_RAW(s, n) (s *)malloc(n * sizeof(s)) # define E_FREE(p) do { free(p); p = NULL; } while (0) -# define E_FREE_LIST(list, free) \ - do \ - { \ - if (list) \ - { \ - void *data; \ - EINA_LIST_FREE(list, data) \ - { \ - free(data); \ - } \ - list = NULL; \ - } \ - } \ - while (0) +# define E_FREE_LIST(list, free) \ + do \ + { \ + void *_tmp_; \ + EINA_LIST_FREE(list, _tmp_) \ + { \ + free(_tmp_); \ + } \ + } \ + while (0) # define E_CLAMP(x, min, max) (x < min ? min : (x > max ? max : x)) # define E_RECTS_CLIP_TO_RECT(_x, _y, _w, _h, _cx, _cy, _cw, _ch) \ diff --git a/src/bin/e_config.c b/src/bin/e_config.c index 8d9c35d9a..8d787c050 100644 --- a/src/bin/e_config.c +++ b/src/bin/e_config.c @@ -2233,45 +2233,45 @@ _e_config_eet_close_handle(Eet_File *ef, char *file) static void _e_config_acpi_bindings_add(void) { - E_Config_Binding_Acpi *bind; + E_Config_Binding_Acpi *binding; - bind = E_NEW(E_Config_Binding_Acpi, 1); - bind->context = E_BINDING_CONTEXT_NONE; - bind->type = E_ACPI_TYPE_AC_ADAPTER; - bind->status = 0; - bind->action = eina_stringshare_add("dim_screen"); - bind->params = NULL; - e_config->acpi_bindings = eina_list_append(e_config->acpi_bindings, bind); + binding = E_NEW(E_Config_Binding_Acpi, 1); + binding->context = E_BINDING_CONTEXT_NONE; + binding->type = E_ACPI_TYPE_AC_ADAPTER; + binding->status = 0; + binding->action = eina_stringshare_add("dim_screen"); + binding->params = NULL; + e_config->acpi_bindings = eina_list_append(e_config->acpi_bindings, binding); - bind = E_NEW(E_Config_Binding_Acpi, 1); - bind->context = E_BINDING_CONTEXT_NONE; - bind->type = E_ACPI_TYPE_AC_ADAPTER; - bind->status = 1; - bind->action = eina_stringshare_add("undim_screen"); - bind->params = NULL; - e_config->acpi_bindings = eina_list_append(e_config->acpi_bindings, bind); + binding = E_NEW(E_Config_Binding_Acpi, 1); + binding->context = E_BINDING_CONTEXT_NONE; + binding->type = E_ACPI_TYPE_AC_ADAPTER; + binding->status = 1; + binding->action = eina_stringshare_add("undim_screen"); + binding->params = NULL; + e_config->acpi_bindings = eina_list_append(e_config->acpi_bindings, binding); - bind = E_NEW(E_Config_Binding_Acpi, 1); - bind->context = E_BINDING_CONTEXT_NONE; - bind->type = E_ACPI_TYPE_LID; - bind->status = 0; - bind->action = eina_stringshare_add("suspend"); - bind->params = eina_stringshare_add("now"); - e_config->acpi_bindings = eina_list_append(e_config->acpi_bindings, bind); + binding = E_NEW(E_Config_Binding_Acpi, 1); + binding->context = E_BINDING_CONTEXT_NONE; + binding->type = E_ACPI_TYPE_LID; + binding->status = 0; + binding->action = eina_stringshare_add("suspend"); + binding->params = eina_stringshare_add("now"); + e_config->acpi_bindings = eina_list_append(e_config->acpi_bindings, binding); - bind = E_NEW(E_Config_Binding_Acpi, 1); - bind->context = E_BINDING_CONTEXT_NONE; - bind->type = E_ACPI_TYPE_POWER; - bind->status = -1; - bind->action = eina_stringshare_add("halt_now"); - bind->params = eina_stringshare_add("now"); - e_config->acpi_bindings = eina_list_append(e_config->acpi_bindings, bind); + binding = E_NEW(E_Config_Binding_Acpi, 1); + binding->context = E_BINDING_CONTEXT_NONE; + binding->type = E_ACPI_TYPE_POWER; + binding->status = -1; + binding->action = eina_stringshare_add("halt_now"); + binding->params = eina_stringshare_add("now"); + e_config->acpi_bindings = eina_list_append(e_config->acpi_bindings, binding); - bind = E_NEW(E_Config_Binding_Acpi, 1); - bind->context = E_BINDING_CONTEXT_NONE; - bind->type = E_ACPI_TYPE_SLEEP; - bind->status = -1; - bind->action = eina_stringshare_add("suspend"); - bind->params = eina_stringshare_add("now"); - e_config->acpi_bindings = eina_list_append(e_config->acpi_bindings, bind); + binding = E_NEW(E_Config_Binding_Acpi, 1); + binding->context = E_BINDING_CONTEXT_NONE; + binding->type = E_ACPI_TYPE_SLEEP; + binding->status = -1; + binding->action = eina_stringshare_add("suspend"); + binding->params = eina_stringshare_add("now"); + e_config->acpi_bindings = eina_list_append(e_config->acpi_bindings, binding); } diff --git a/src/bin/e_config.h b/src/bin/e_config.h index e0853bf60..272e5c8f9 100644 --- a/src/bin/e_config.h +++ b/src/bin/e_config.h @@ -1,6 +1,6 @@ #ifdef E_TYPEDEFS -#define E_CONFIG_LIMIT(v, min, max) {if (v > max) v = max; else if (v < min) v = min;} +#define E_CONFIG_LIMIT(v, min, max) {if (v >= max) v = max; else if (v <= min) v = min;} typedef struct _E_Config E_Config; typedef struct _E_Config_Module E_Config_Module; diff --git a/src/bin/e_eap_editor.c b/src/bin/e_eap_editor.c index 67f5889e3..770a95ad6 100644 --- a/src/bin/e_eap_editor.c +++ b/src/bin/e_eap_editor.c @@ -380,7 +380,7 @@ _e_desktop_edit_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data static void _e_desktop_edit_user_local_desktop_filename_generate(E_Config_Dialog_Data *cfdata, char *path) { - char basename[PATH_MAX]; + char buf[PATH_MAX]; const char *name; unsigned int i; int prefix; @@ -396,20 +396,20 @@ _e_desktop_edit_user_local_desktop_filename_generate(E_Config_Dialog_Data *cfdat if (name) { const char *s = name; - for (i = 0; i < sizeof(basename) && s[i]; i++) + for (i = 0; i < sizeof(buf) && s[i]; i++) { if (isalnum(s[i])) - basename[i] = s[i]; + buf[i] = s[i]; else - basename[i] = '_'; + buf[i] = '_'; } - basename[i] = '\0'; + buf[i] = '\0'; } else - eina_strlcpy(basename, "unnamed_desktop", sizeof(basename)); + eina_strlcpy(buf, "unnamed_desktop", sizeof(buf)); i = snprintf(path, PATH_MAX, "%s/applications/%s.desktop", - efreet_data_home_get(), basename); + efreet_data_home_get(), buf); if (i >= PATH_MAX) { path[0] = '\0'; diff --git a/src/bin/e_fm_op_registry.c b/src/bin/e_fm_op_registry.c index f48a537b9..d249ec3c2 100644 --- a/src/bin/e_fm_op_registry.c +++ b/src/bin/e_fm_op_registry.c @@ -128,7 +128,7 @@ _e_fm2_op_registry_entry_internal_event(E_Fm2_Op_Registry_Entry_Internal *e, int } Eina_Bool -e_fm2_op_registry_entry_add(int id, Evas_Object *e_fm, E_Fm_Op_Type op, E_Fm2_Op_Registry_Abort_Func abort) +e_fm2_op_registry_entry_add(int id, Evas_Object *e_fm, E_Fm_Op_Type op, E_Fm2_Op_Registry_Abort_Func abrt) { E_Fm2_Op_Registry_Entry_Internal *e; @@ -140,7 +140,7 @@ e_fm2_op_registry_entry_add(int id, Evas_Object *e_fm, E_Fm_Op_Type op, E_Fm2_Op e->entry.start_time = ecore_loop_time_get(); e->entry.op = op; e->entry.status = E_FM2_OP_STATUS_IN_PROGRESS; - e->entry.func.abort = abort; + e->entry.func.abort = abrt; e->references = 1; if (!eina_hash_add(_e_fm2_op_registry, &id, e)) diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c index a76d6ba45..f10673eba 100644 --- a/src/bin/e_gadcon.c +++ b/src/bin/e_gadcon.c @@ -3391,8 +3391,6 @@ _e_gadcon_layout_smart_reconfigure(E_Smart_Data *sd) EINA_LIST_FOREACH(sd->items, l, obj) { - E_Gadcon_Layout_Item *bi; - bi = evas_object_data_get(obj, "e_gadcon_layout_data"); if (!bi) continue; @@ -3925,9 +3923,6 @@ _e_gadcon_layout_smart_gadcon_position_shrinked_mode(E_Smart_Data *sd) bi->gcc->state_info.resist = 0; if (eina_list_prev(l)) { - E_Gadcon_Layout_Item *bi2; - void *tp; - tp = eina_list_data_get(eina_list_prev(l)); l->prev->data = eina_list_data_get(l); diff --git a/src/bin/e_int_shelf_config.c b/src/bin/e_int_shelf_config.c index 3ba42c6c0..ffc5d3108 100644 --- a/src/bin/e_int_shelf_config.c +++ b/src/bin/e_int_shelf_config.c @@ -255,7 +255,7 @@ static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { E_Config_Shelf_Desk *sd; - int restart = 0; + int recreate = 0; if (!cfdata->escfg->style) { @@ -275,21 +275,21 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) cfdata->escfg->orient = cfdata->orient; e_shelf_orient(cfdata->es, cfdata->orient); e_shelf_position_calc(cfdata->es); - restart = 1; + recreate = 1; } if (cfdata->escfg->fit_along != cfdata->fit_along) { cfdata->escfg->fit_along = cfdata->fit_along; cfdata->es->fit_along = cfdata->fit_along; - restart = 1; + recreate = 1; } if (cfdata->escfg->size != cfdata->size) { cfdata->escfg->size = cfdata->size; cfdata->es->size = cfdata->size; - restart = 1; + recreate = 1; } if (cfdata->layer == 0) @@ -298,7 +298,7 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { cfdata->escfg->popup = 0; cfdata->escfg->layer = 1; - restart = 1; + recreate = 1; } } else if (cfdata->layer == 1) @@ -307,7 +307,7 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { cfdata->escfg->popup = 1; cfdata->escfg->layer = 0; - restart = 1; + recreate = 1; } } else if (cfdata->layer == 2) @@ -316,7 +316,7 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { cfdata->escfg->popup = 1; cfdata->escfg->layer = 200; - restart = 1; + recreate = 1; } } @@ -352,7 +352,7 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) } } - if (restart) + if (recreate) { E_Zone *zone; @@ -375,7 +375,6 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { E_Desk *desk; Eina_List *l; - E_Config_Shelf_Desk *sd; int show = 0; desk = e_desk_current_get(cfdata->es->zone); diff --git a/src/bin/e_manager.c b/src/bin/e_manager.c index ad3c9c701..97a29898d 100644 --- a/src/bin/e_manager.c +++ b/src/bin/e_manager.c @@ -781,7 +781,7 @@ _e_manager_cb_frame_extents_request(void *data, int ev_type __UNUSED__, void *ev Ecore_X_MWM_Hint_Decor decor; Ecore_X_Window_State *state; Frame_Extents *extents; - const char *border, *signal, *key; + const char *border, *sig, *key; int ok; unsigned int i, num; @@ -815,7 +815,7 @@ _e_manager_cb_frame_extents_request(void *data, int ev_type __UNUSED__, void *ev key = border; } - signal = NULL; + sig = NULL; ecore_x_netwm_window_state_get(e->win, &state, &num); if (state) { @@ -852,7 +852,7 @@ _e_manager_cb_frame_extents_request(void *data, int ev_type __UNUSED__, void *ev if ((maximized == 2) && (e_config->maximize_policy == E_MAXIMIZE_FULLSCREEN)) { - signal = "e,action,maximize,fullscreen"; + sig = "e,action,maximize,fullscreen"; key = "maximize,fullscreen"; } free(state); @@ -874,9 +874,9 @@ _e_manager_cb_frame_extents_request(void *data, int ev_type __UNUSED__, void *ev { Evas_Coord x, y, w, h; - if (signal) + if (sig) { - edje_object_signal_emit(o, signal, "e"); + edje_object_signal_emit(o, sig, "e"); edje_object_message_signal_process(o); } diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c index f9ebe3c32..b908954aa 100644 --- a/src/bin/e_menu.c +++ b/src/bin/e_menu.c @@ -496,7 +496,7 @@ e_menu_category_data_set(char *category, void *data) } EAPI E_Menu_Category_Callback * -e_menu_category_callback_add(char *category, void (*create) (E_Menu *m, void *category_data, void *data), void (*free) (void *data), void *data) +e_menu_category_callback_add(char *category, void (*create_cb) (E_Menu *m, void *category_data, void *data), void (*free_cb) (void *data), void *data) { E_Menu_Category *cat; E_Menu_Category_Callback *cb = NULL; @@ -513,8 +513,8 @@ e_menu_category_callback_add(char *category, void (*create) (E_Menu *m, void *ca if (cb) { cb->data = data; - cb->create = create; - cb->free = free; + cb->create = create_cb; + cb->free = free_cb; cb->category = eina_stringshare_add(category); cat->callbacks = eina_list_append(cat->callbacks, cb); } @@ -1398,8 +1398,6 @@ _e_menu_item_realize(E_Menu_Item *mi) } else { - int icon_w = 0, icon_h = 0; - o = edje_object_add(mi->menu->evas); e_icon_size_get(mi->icon_object, &icon_w, &icon_h); mi->icon_w = icon_w; diff --git a/src/bin/e_powersave.c b/src/bin/e_powersave.c index 5444bc15a..3ce0fd028 100644 --- a/src/bin/e_powersave.c +++ b/src/bin/e_powersave.c @@ -9,7 +9,6 @@ struct _E_Powersave_Deferred_Action /* local subsystem functions */ static Eina_Bool _e_powersave_cb_deferred_timer(void *data); -static Eina_Bool _e_powersave_cb_config(void *data); static void _e_powersave_mode_eval(void); static void _e_powersave_event_update_free(void *data __UNUSED__, void *event); @@ -19,9 +18,6 @@ EAPI int E_EVENT_POWERSAVE_CONFIG_UPDATE = 0; static int walking_deferred_actions = 0; static Eina_List *deferred_actions = NULL; static Ecore_Timer *deferred_timer = NULL; -static Ecore_Timer *config_timer = NULL; -static E_Powersave_Mode powersave_mode_min = E_POWERSAVE_MODE_NONE; -static E_Powersave_Mode powersave_mode_max = E_POWERSAVE_MODE_EXTREME; static E_Powersave_Mode powersave_mode = E_POWERSAVE_MODE_LOW; static double defer_time = 5.0; diff --git a/src/bin/e_xsettings.c b/src/bin/e_xsettings.c index 1b1d31011..4689b35ff 100644 --- a/src/bin/e_xsettings.c +++ b/src/bin/e_xsettings.c @@ -207,7 +207,7 @@ _e_xsettings_string_set(const char *name, const char *value) s->last_change = ecore_x_current_time_get(); } - +#if 0 static void _e_xsettings_int_set(const char *name, int value, Eina_Bool set) { @@ -252,6 +252,7 @@ _e_xsettings_int_set(const char *name, int value, Eina_Bool set) s->length = 12; s->length += OFFSET_ADD(strlen(name)); } +#endif static unsigned char * _e_xsettings_copy(unsigned char *buffer, Setting *s) @@ -470,6 +471,7 @@ _e_xsettings_font_set(void) _e_xsettings_string_set(_setting_font_name, NULL); } +#if 0 static void _e_xsettings_xft_set(void) { @@ -480,6 +482,7 @@ _e_xsettings_xft_set(void) _e_xsettings_int_set(_setting_xft_dpi, 0, EINA_FALSE); } +#endif static void _e_xsettings_start(void) diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c index 0a84b3e85..75d589bfd 100644 --- a/src/bin/e_zone.c +++ b/src/bin/e_zone.c @@ -436,7 +436,7 @@ e_zone_flip_coords_handle(E_Zone *zone, int y) { E_Event_Zone_Edge *zev; - E_Binding_Edge *bind; + E_Binding_Edge *binding; E_Zone_Edge edge; Eina_List *l; E_Shelf *es; @@ -553,9 +553,9 @@ noflip: break; } if (!ok) return; - bind = e_bindings_edge_get("desk_flip_in_direction", edge, 0); - if (!bind) bind = e_bindings_edge_get("desk_flip_by", edge, 0); - if (bind) + binding = e_bindings_edge_get("desk_flip_in_direction", edge, 0); + if (!binding) binding = e_bindings_edge_get("desk_flip_by", edge, 0); + if (binding) { zev = E_NEW(E_Event_Zone_Edge, 1); zev->zone = zone; @@ -563,9 +563,9 @@ noflip: zev->y = y; zev->edge = edge; zone->flip.ev = zev; - zone->flip.bind = bind; + zone->flip.bind = binding; zone->flip.switching = 1; - bind->timer = ecore_timer_add(((double)bind->delay), _e_zone_cb_edge_timer, zone); + binding->timer = ecore_timer_add(((double)binding->delay), _e_zone_cb_edge_timer, zone); } }