jf_simon
/
enlightenment_my
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make clang happy 

SVN revision: 45176
This commit is contained in:
Sebastian Dransfeld 2010-01-15 11:29:50 +00:00
parent 6c2a7724c2
commit 78b294c4a8
12 changed files with 20 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/bin/e_fm_main.c
View File

@ -763,9 +763,12 @@ _e_dbus_format_error_msg(char **buf, E_Volume *v, DBusError *error)
tmp = *buf = malloc(size);
strcpy(tmp, v->udi);
strcpy(tmp += vu, v->mount_point);
strcpy(tmp += vm, error->name);
strcpy(tmp += en, error->message);
tmp += vu;
strcpy(tmp, v->mount_point);
tmp += vm;
strcpy(tmp, error->name);
tmp += en;
strcpy(tmp, error->message);
return size;
}
@ -971,7 +974,7 @@ e_volume_mount(E_Volume *v)
v->guard = ecore_timer_add(E_FM_MOUNT_TIMEOUT, _e_dbus_vol_mount_timeout, v);
v->op = e_hal_device_volume_mount(_e_dbus_conn, v->udi, mount_point,
v->fstype, opt, _e_dbus_cb_vol_mounted, v);
opt = eina_list_free(opt);
eina_list_free(opt);
}
static int
@ -1184,9 +1187,6 @@ _e_ipc_cb_server_add(void *data, int type, void *event)
static int
_e_ipc_cb_server_del(void *data, int type, void *event)
{
Ecore_Ipc_Event_Server_Del *e;
e = event;
/* quit now */
ecore_main_loop_quit();
return 1;

2
src/bin/e_fm_prop.c
View File

@ -324,12 +324,10 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
Evas_Object *o, *ot, *ob, *of, *oi;
E_Radio_Group *rg;
char buf[4096];
E_Fm2_Config *cfg;
const char *itype = NULL;
snprintf(buf, sizeof(buf), "%s/%s",
e_fm2_real_path_get(cfdata->fi->fm), cfdata->fi->file);
cfg = e_fm2_config_get(cfdata->fi->fm);
o = e_widget_table_add(evas, 0);
ot = e_widget_table_add(evas, 0);

11
src/bin/e_gadcon.c
View File

@ -3997,8 +3997,8 @@ _e_gadcon_layout_smart_gadcons_position(E_Smart_Data *sd, Eina_List **list)
{
int ok, lc_moving_prev_pos;
Eina_List *l, *l2, *l3;
E_Layout_Item_Container *lc_moving = NULL, *lc_back, *lc, *lc3;
E_Gadcon_Layout_Item *bi, *bi_moving;
E_Layout_Item_Container *lc_moving = NULL, *lc_back = NULL, *lc, *lc3;
E_Gadcon_Layout_Item *bi, *bi_moving = NULL;
if ((!list) || (!*list)) return;
@ -4345,8 +4345,11 @@ _e_gadcon_layout_smart_gadcons_position(E_Smart_Data *sd, Eina_List **list)
LC_FREE(lc_back);
}
bi_moving->gcc->config.pos = bi_moving->ask.pos = bi_moving->x;
bi_moving->gcc->config.size = bi_moving->w;
if (bi_moving)
{
bi_moving->gcc->config.pos = bi_moving->ask.pos = bi_moving->x;
bi_moving->gcc->config.size = bi_moving->w;
}
}
static void

3
src/bin/e_ilist.c
View File

@ -775,7 +775,6 @@ e_ilist_multi_select(Evas_Object *obj, int n)
EAPI void
e_ilist_range_select(Evas_Object *obj, int n)
{
E_Ilist_Item *si = NULL;
int i, j, dir;
API_ENTRY return;
@ -788,7 +787,7 @@ e_ilist_range_select(Evas_Object *obj, int n)
if (n < sd->selected) dir = 0;
else dir = 1;
if (!(si = eina_list_nth(sd->items, n))) return;
if (!eina_list_nth(sd->items, n)) return;
if (dir == 1)
{
for (j = (sd->selected + 1); ((j < i) && (j <= n)); j++)

4
src/bin/e_imc_main.c
View File

@ -128,8 +128,6 @@ main(int argc, char **argv)
/* else create new imc */
if (write_ops != 0)
{
int write_ok;
write_imc = calloc(sizeof(E_Input_Method_Config), 1);
write_imc->version = E_INTL_INPUT_METHOD_CONFIG_VERSION;
if (read_imc != NULL)
@ -157,7 +155,7 @@ main(int argc, char **argv)
/* write imc to file */
write_ok = e_intl_input_method_config_write(ef, write_imc);
e_intl_input_method_config_write(ef, write_imc);
}

3
src/bin/e_init_main.c
View File

@ -170,9 +170,6 @@ _e_ipc_cb_server_add(void *data, int type, void *event)
static int
_e_ipc_cb_server_del(void *data, int type, void *event)
{
Ecore_Ipc_Event_Server_Del *e;
e = event;
/* quit now */
ecore_main_loop_quit();
return 1;

6
src/bin/e_int_border_menu.c
View File

@ -228,7 +228,6 @@ e_int_border_menu_create(E_Border *bd)
{
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
separator = 1;
}
if ((!bd->lock_close) && (!bd->internal))
@ -269,13 +268,10 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_
EAPI void
e_int_border_menu_del(E_Border *bd)
{
int was_menu = 0;
if (bd->border_menu)
{
e_object_del(E_OBJECT(bd->border_menu));
bd->border_menu = NULL;
was_menu = 1;
}
}
@ -962,7 +958,6 @@ _e_border_menu_cb_border_pre(void *data, E_Menu *m, E_Menu_Item *mi)
E_Menu *subm;
E_Menu_Item *submi;
E_Border *bd;
Evas *evas;
if (!(bd = data)) return;
@ -993,7 +988,6 @@ _e_border_menu_cb_border_pre(void *data, E_Menu *m, E_Menu_Item *mi)
e_menu_item_callback_set(submi, _e_border_menu_cb_iconpref_e, bd);
submi = e_menu_item_new(subm);
evas = submi->menu->evas;
e_menu_item_label_set(submi, _("Use Application Provided Icon "));
e_menu_item_radio_set(submi, 1);
e_menu_item_radio_group_set(submi, 2);

11
src/bin/e_manager.c
View File

@ -98,12 +98,9 @@ e_manager_new(Ecore_X_Window root, int num)
ecore_x_window_size_get(man->root, &(man->w), &(man->h));
if (e_config->use_virtual_roots)
{
Ecore_X_Window mwin;
man->win = ecore_x_window_override_new(man->root, man->x, man->y, man->w, man->h);
ecore_x_icccm_title_set(man->win, "Enlightenment Manager");
ecore_x_netwm_name_set(man->win, "Enlightenment Manager");
mwin = e_menu_grab_window_get();
ecore_x_window_raise(man->win);
}
else
@ -172,12 +169,10 @@ e_manager_manage_windows(E_Manager *man)
"KWM_DOCKWINDOW"
};
Ecore_X_Atom atoms[3];
Ecore_X_Atom atom_xmbed, atom_kde_netwm_systray, atom_kwm_dockwindow,
atom_window;
Ecore_X_Atom atom_xmbed, atom_kde_netwm_systray, atom_kwm_dockwindow;
unsigned char *data = NULL;
int count;
atom_window = ECORE_X_ATOM_WINDOW;
ecore_x_atoms_get(atom_names, 3, atoms);
atom_xmbed = atoms[0];
atom_kde_netwm_systray = atoms[1];
@ -666,7 +661,6 @@ _e_manager_cb_frame_extents_request(void *data, int ev_type __UNUSED__, void *ev
if (state)
{
int maximized = 0;
int fullscreen = 0;
for (i = 0; i < num; i++)
{
@ -679,7 +673,6 @@ _e_manager_cb_frame_extents_request(void *data, int ev_type __UNUSED__, void *ev
maximized++;
break;
case ECORE_X_WINDOW_STATE_FULLSCREEN:
fullscreen = 1;
border = "borderless";
key = border;
break;
@ -815,11 +808,9 @@ _e_manager_cb_screensaver_notify(void *data __UNUSED__, int ev_type __UNUSED__,
static int
_e_manager_cb_client_message(void *data, int ev_type, void *ev)
{
E_Manager *man;
Ecore_X_Event_Client_Message *e;
E_Border *bd;
man = data;
e = ev;
if (e->message_type == ECORE_X_ATOM_NET_ACTIVE_WINDOW)

3
src/bin/e_menu.c
View File

@ -1010,6 +1010,7 @@ e_menu_idler_before(void)
break;
}
}
// TODO: This is meaningless
changed = 0;
}
if (changed)
@ -1034,7 +1035,7 @@ e_menu_idler_before(void)
}
}
/* del refcount to all menus we worked with */
tmp = _e_menu_list_free_unref(tmp);
_e_menu_list_free_unref(tmp);
if (!_e_active_menus)
{

2
src/bin/e_msg.c
View File

@ -56,7 +56,7 @@ e_msg_send(const char *name, const char *info, int val, E_Object *obj)
unsigned int size, pos, name_len, info_len;
E_Msg_Event *ev;
name_len = info_len = size = 0;
name_len = info_len = 0;
size = sizeof(E_Msg_Event);
if (name) name_len = strlen(name) + 1;
if (info) info_len = strlen(info) + 1;

2
src/bin/e_place.c
View File

@ -169,8 +169,6 @@ e_place_zone_region_smart(E_Zone *zone, Eina_List *skiplist, int x, int y, int w
a_alloc_w = 2;
a_alloc_h = 2;
x -= zone->x;
y -= zone->y;
zw = zone->w;
zh = zone->h;

6
src/bin/e_pointer.c
View File

@ -459,11 +459,9 @@ _e_pointer_active_handle(E_Pointer *p)
static int
_e_pointer_cb_mouse_down(void *data, int type, void *event)
{
Ecore_Event_Mouse_Button *ev;
Eina_List *l;
E_Pointer *p;
ev = event;
EINA_LIST_FOREACH(_e_pointers, l, p)
{
_e_pointer_active_handle(p);
@ -501,11 +499,9 @@ _e_pointer_cb_mouse_up(void *data, int type, void *event)
static int
_e_pointer_cb_mouse_move(void *data, int type, void *event)
{
Ecore_Event_Mouse_Move *ev;
Eina_List *l;
E_Pointer *p;
ev = event;
EINA_LIST_FOREACH(_e_pointers, l, p)
{
_e_pointer_active_handle(p);
@ -522,11 +518,9 @@ _e_pointer_cb_mouse_move(void *data, int type, void *event)
static int
_e_pointer_cb_mouse_wheel(void *data, int type, void *event)
{
Ecore_Event_Mouse_Wheel *ev;
Eina_List *l;
E_Pointer *p;
ev = event;
EINA_LIST_FOREACH(_e_pointers, l, p)
{
_e_pointer_active_handle(p);