make clang happy

SVN revision: 45153

src/bin/e_bg.c

@@ -716,7 +716,6 @@ _e_bg_slide_animator(void *data)
    E_Bg_Anim_Params *params;
    E_Zone *zone;
    Evas_Object *o;
-   E_Desk *desk;
    double st;
    double t, dt, spd;
    Evas_Coord px, py, rx, ry, bw, bh, panw, panh;
@@ -724,9 +723,7 @@ _e_bg_slide_animator(void *data)
 
    params = data;
    zone = params->zone;
-   desk = e_desk_current_get(zone);
    t = ecore_loop_time_get();
-   dt = -1.0;
    spd = e_config->desk_flip_animate_time;
 
    o = zone->bg_scrollframe;

src/bin/e_border.c

@@ -4003,7 +4003,6 @@ _e_border_cb_window_hide(void *data, int ev_type, void *ev)
    E_Border *bd;
    Ecore_X_Event_Window_Hide *e;
 
-   bd = data;
    e = ev;
 //   printf("HIDE: %x, event %x\n", e->win, e->event_win);
 // not interested in hide events from windows other than the window in question
@@ -4302,7 +4301,6 @@ _e_border_cb_window_resize_request(void *data, int ev_type, void *ev)
    E_Border *bd;
    Ecore_X_Event_Window_Resize_Request *e;
 
-   bd = data;
    e = ev;
    bd = e_border_find_by_client_window(e->win);
    if (!bd)

src/bin/e_config_dialog.c

@@ -426,7 +426,7 @@ _e_config_dialog_unchanged(E_Config_Dialog *cfd)
 static int
 _e_config_dialog_check_changed(E_Config_Dialog *cfd, unsigned char def)
 {
-   int changed;
+   int changed = 0;
 
    if (cfd->view_type == E_CONFIG_DIALOG_CFDATA_TYPE_BASIC)
      {

src/bin/e_desklock.c

@@ -653,6 +653,8 @@ _e_desklock_state_set(int state)
 	signal = "e,state,invalid";
 	text = "The password you entered is invalid. Try again.";
      }
+   else
+     return;
 
    EINA_LIST_FOREACH(edd->elock_wnd_list, l, edp)
      {

src/bin/e_dnd.c

@@ -479,6 +479,7 @@ e_drag_idler_before(void)
 				 break;
 			      }
 			 }
+		       // TODO: This is meaningless
 		       changed = 0;
 		    }
 		  if (changed)
@@ -1266,7 +1267,6 @@ _e_dnd_cb_event_dnd_position(void *data, int type, void *event)
 {
    Ecore_X_Event_Xdnd_Position *ev;
    Ecore_X_Rectangle rect;
-   Ecore_X_Action action;
    const char *id;
    const Eina_List *l;
    E_Drop_Handler *h;
@@ -1289,8 +1289,6 @@ _e_dnd_cb_event_dnd_position(void *data, int type, void *event)
    rect.width = 0;
    rect.height = 0;
 
-   action = ev->action;
-
    active = 0;
    EINA_LIST_FOREACH(_drop_handlers, l, h)
      {

src/bin/e_eap_editor.c

@@ -134,7 +134,7 @@ EAPI E_Desktop_Edit *
 e_desktop_border_edit(E_Container *con, E_Border *bd)
 {
    E_Desktop_Edit *editor;
-   int new_desktop;
+   int new_desktop = 0;
 
    if (!con) return NULL;
    editor = E_OBJECT_ALLOC(E_Desktop_Edit, E_DESKTOP_EDIT_TYPE, _e_desktop_edit_free);
@@ -357,11 +357,9 @@ static int
 _e_desktop_edit_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    E_Desktop_Edit *editor;
-   Efreet_Desktop *desktop;
    char *str;
 
    editor = cfdata->editor;
-   desktop = editor->desktop;
 
    IFFREE(cfdata->desktop->name);
    IFDUP(cfdata->name, cfdata->desktop->name);
@@ -448,13 +446,11 @@ static Evas_Object *
 _e_desktop_edit_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
 {
    E_Desktop_Edit *editor;
-   Efreet_Desktop *desktop;
    Evas_Object *ol, *o;
    Evas_Object *entry;
 
    editor = cfdata->editor;
    editor->evas = evas;
-   desktop = editor->desktop;
 
    ol = e_widget_table_add(evas, 0);
 
@@ -499,13 +495,11 @@ static Evas_Object *
 _e_desktop_edit_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
 {
    E_Desktop_Edit *editor;
-   Efreet_Desktop *desktop;
    Evas_Object *ol, *o;
    Evas_Object *entry;
    Evas_Object *fn;
 
    editor = cfdata->editor;
-   desktop = editor->desktop;
 
    ol = _e_desktop_edit_basic_create_widgets(cfd, evas, cfdata);
 
@@ -685,11 +679,8 @@ _e_desktop_editor_cb_exec_select(void *data1, void *data2)
 }
 
 static void
-_e_desktop_edit_select_cb(void *data, Evas_Object *obj)
+_e_desktop_edit_select_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__)
 {
-   E_Config_Dialog_Data *cfdata;
-
-   cfdata = data;
 }
 
 static void

src/bin/e_editable.c

@@ -407,9 +407,7 @@ e_editable_cursor_pos_get(Evas_Object *editable)
 EAPI void
 e_editable_cursor_move_to_start(Evas_Object *editable)
 {
-   E_Editable_Smart_Data *sd;
+   if (!editable)
-
-   if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return;
    e_editable_cursor_pos_set(editable, 0);
 }
@@ -544,9 +542,7 @@ e_editable_selection_pos_get(Evas_Object *editable)
 EAPI void
 e_editable_selection_move_to_start(Evas_Object *editable)
 {
-   E_Editable_Smart_Data *sd;
+   if (!editable)
-
-   if ((!editable) || (!(sd = evas_object_smart_data_get(editable))))
      return;
    e_editable_selection_pos_set(editable, 0);
 }

src/bin/e_exec.c

@@ -423,7 +423,6 @@ 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)
 {
-   E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    E_Config_Dialog_Data *cfdata;
    E_Container *con;
@@ -450,9 +449,9 @@ _e_exec_error_dialog(Efreet_Desktop *desktop, const char *exec, Ecore_Exe_Event_
 
    con = e_container_current_get(e_manager_current_get());
    /* Create The Dialog */
-   cfd = e_config_dialog_new(con, _("Application Execution Error"), 
+   e_config_dialog_new(con, _("Application Execution Error"), 
-			     "E", "_e_exec_error_exit_dialog",
+		       "E", "_e_exec_error_exit_dialog",
-			     NULL, 0, v, cfdata);
+		       NULL, 0, v, cfdata);
 }
 
 static void

src/bin/e_flowlayout.c

@@ -469,7 +469,7 @@ _e_flowlayout_smart_reconfigure(E_Smart_Data *sd)
    Evas_Coord x, y, w, h, xx, yy, cr, cc;
    Eina_List *l;
    Evas_Object *obj;
-   int minw, minh, wdif, hdif;
+   int minw, minh;
    int count, expand;
 
 
@@ -535,8 +535,6 @@ _e_flowlayout_smart_reconfigure(E_Smart_Data *sd)
      }
    
    /* Some calculations */
-   wdif = w - minw;
-   hdif = h - minh;
    if (sd->flowright)
      xx = x;
    else

src/bin/e_fm.c

@@ -2283,12 +2283,11 @@ static int _e_fm2_client_spawning = 0;
 static void
 _e_fm2_client_spawn(void)
 {
-   Ecore_Exe *exe;
    char buf[4096];
 
    if (_e_fm2_client_spawning) return;
    snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_fm", e_prefix_lib_get());
-   exe = ecore_exe_run(buf, NULL);
+   ecore_exe_run(buf, NULL);
    _e_fm2_client_spawning = 1;
 }
 
@@ -2577,7 +2576,6 @@ _e_fm2_client_mount(const char *udi, const char *mountpoint)
 EAPI int
 _e_fm2_client_unmount(const char *udi)
 {
-   E_Fm2_Client *cl;
    char *d;
    int l, l1;
 
@@ -2586,7 +2584,7 @@ _e_fm2_client_unmount(const char *udi)
    d = alloca(l);
    strcpy(d, udi);
 
-   cl = _e_fm2_client_get();
+   _e_fm2_client_get();
 
    return _e_fm_client_send_new(E_FM_OP_UNMOUNT, (void *)d, l);
 }
@@ -2749,7 +2747,6 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e)
 		  p += strlen(lnk) + 1;
 
 		  rlnk = (char *)p;
-		  p += strlen(rlnk) + 1;
 
 		  memcpy(&(finf.st), &st, sizeof(struct stat));
 		  finf.broken_link = broken_link;
@@ -5307,8 +5304,6 @@ _e_fm2_icon_sel_down(Evas_Object *obj)
    if (!sd) return;
    if (!sd->icons) return;
 
-   view_mode = _e_fm2_view_mode_get(sd);
-
    view_mode = _e_fm2_view_mode_get(sd);
    if ((view_mode == E_FM2_VIEW_MODE_CUSTOM_SMART_GRID_ICONS) ||
        (view_mode == E_FM2_VIEW_MODE_CUSTOM_GRID_ICONS) ||
@@ -5939,11 +5934,9 @@ static void
 _e_fm2_cb_dnd_leave(void *data, const char *type, void *event)
 {
    E_Fm2_Smart_Data *sd;
-   E_Event_Dnd_Leave *ev;
 
    sd = data;
    if (type != _e_fm2_mime_text_uri_list) return;
-   ev = (E_Event_Dnd_Leave *)event;
    _e_fm2_dnd_drop_hide(sd->obj);
    _e_fm2_dnd_drop_all_hide(sd->obj);
 }
@@ -6115,7 +6108,7 @@ _e_fm2_cb_dnd_drop(void *data, const char *type, void *event)
    Eina_List *fsel, *l, *ll, *il, *isel;
    char buf[4096];
    const char *fp;
-   Evas_Coord dx, dy, ox, oy, x, y;
+   Evas_Coord ox, oy, x, y;
    int adjust_icons = 0;
 
    char dirpath[PATH_MAX];
@@ -6130,7 +6123,6 @@ _e_fm2_cb_dnd_drop(void *data, const char *type, void *event)
    fsel = _e_fm2_uri_path_list_get(ev->data);
    isel = _e_fm2_uri_icon_list_get(fsel);
    if (!isel) return;
-   dx = 0; dy = 0;
    ox = 0; oy = 0;
    EINA_LIST_FOREACH(isel, l, ic)
      {
@@ -6138,8 +6130,6 @@ _e_fm2_cb_dnd_drop(void *data, const char *type, void *event)
 	  {
 	     ox = ic->x;
 	     oy = ic->y;
-	     dx = (ic->drag.x + ic->x - ic->sd->pos.x);
-	     dy = (ic->drag.y + ic->y - ic->sd->pos.y);
 	     break;
 	  }
      }
@@ -6217,7 +6207,6 @@ _e_fm2_cb_dnd_drop(void *data, const char *type, void *event)
 	     /* move file into dir that this icon is for */
 	     for (ll = fsel, il = isel; ll && il; ll = eina_list_next(ll), il = eina_list_next(il))
 	       {
-		  ic = eina_list_data_get(il);
 		  fp = eina_list_data_get(ll);
 		  if (!fp) continue;
 
@@ -6240,7 +6229,6 @@ _e_fm2_cb_dnd_drop(void *data, const char *type, void *event)
 	       {
 		  for (ll = fsel, il = isel; ll && il; ll = eina_list_next(ll), il = eina_list_next(il))
 		    {
-		       ic = eina_list_data_get(il);
 		       fp = eina_list_data_get(ll);
 		       if (!fp) continue;
 		       snprintf(buf, sizeof(buf), "%s/%s",
@@ -6266,7 +6254,6 @@ _e_fm2_cb_dnd_drop(void *data, const char *type, void *event)
 	       {
 		  for (ll = fsel, il = isel; ll && il; ll = eina_list_next(ll), il = eina_list_next(il))
 		    {
-		       ic = eina_list_data_get(il);
 		       fp = eina_list_data_get(ll);
 		       if (!fp) continue;
 
@@ -7579,13 +7566,12 @@ static void
 _e_fm2_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
 {
    E_Fm2_Smart_Data *sd;
-   int wch = 0, hch = 0;
+   int wch = 0;
 
    sd = evas_object_smart_data_get(obj);
    if (!sd) return;
    if ((sd->w == w) && (sd->h == h)) return;
    if (w != sd->w) wch = 1;
-   if (h != sd->h) hch = 1;
    sd->w = w;
    sd->h = h;
    evas_object_resize(sd->underlay, sd->w, sd->h);
@@ -7983,7 +7969,6 @@ _e_fm2_icon_menu(E_Fm2_Icon *ic, Evas_Object *obj, unsigned int timestamp)
 	  }
 	}
 	
-	can_w = 0;
 	can_w2 = 1;
 	if (ic->sd->order_file)
 	  {
@@ -8024,7 +8009,7 @@ _e_fm2_icon_menu(E_Fm2_Icon *ic, Evas_Object *obj, unsigned int timestamp)
 	  }
 	else
 	  protect = 0;
-	sel = eina_list_free(sel);
+	eina_list_free(sel);
 
 	if ((can_w) && (can_w2) && !(protect) && !ic->info.removable)
 	  {
@@ -9173,9 +9158,12 @@ _e_fm_hal_error_dialog(const char *title, const char *msg, const char *pstr)
    e_dialog_button_add(dialog, _("OK"), NULL, NULL, NULL);
    
    u = pstr;
-   d = pstr += strlen(pstr) + 1;
+   pstr += strlen(pstr) + 1;
-   n = pstr += strlen(pstr) + 1;
+   d = pstr;
-   m = pstr += strlen(pstr) + 1;
+   pstr += strlen(pstr) + 1;
+   n = pstr;
+   pstr += strlen(pstr) + 1;
+   m = pstr;
    snprintf(text, sizeof(text), "%s<br>%s<br>%s<br>%s<br>%s", msg, u, d, n, m);
    e_dialog_text_set(dialog, text);