Fix warnings.

SVN revision: 19617

diff --git a/src/bin/e_actions.h b/src/bin/e_actions.h
index c83c353..75b6b2e 100644 (file)
--- a/src/bin/e_actions.h
+++ b/src/bin/e_actions.h
@@ -15,7 +15,7 @@ struct _E_Action
 {
    E_Object             e_obj_inherit;
    
-   char *name;
+   const char *name;
    struct {
       void (*go)        (E_Object *obj, char *params);
       void (*go_mouse)  (E_Object *obj, char *params, Ecore_X_Event_Mouse_Button_Down *ev);

diff --git a/src/bin/e_exebuf.c b/src/bin/e_exebuf.c
index 6ecf4a1..39263c2 100644 (file)
--- a/src/bin/e_exebuf.c
+++ b/src/bin/e_exebuf.c
@@ -289,7 +289,7 @@ _e_exebuf_update(void)
    
    edje_object_part_text_set(bg_object, "label", cmd_buf);
    if (icon_object) evas_object_del(icon_object);
-   icon_object == NULL;
+   icon_object = NULL;
    a = e_app_exe_find(cmd_buf);
    if (!a) a = e_app_name_find(cmd_buf);
    if (!a) a = e_app_generic_find(cmd_buf);

diff --git a/src/bin/e_fileman_file.c b/src/bin/e_fileman_file.c
index a9cb6ec..86636f2 100644 (file)
--- a/src/bin/e_fileman_file.c
+++ b/src/bin/e_fileman_file.c
@@ -424,6 +424,7 @@ e_fm_file_exec_with(E_Fm_File *file, char* exec_with)
                            app);
        return 0;
      }
+   return 1;
 }
 
 /* local subsystem functions */

diff --git a/src/bin/e_fileman_icon.c b/src/bin/e_fileman_icon.c
index 06e0925..698eac3 100644 (file)
--- a/src/bin/e_fileman_icon.c
+++ b/src/bin/e_fileman_icon.c
@@ -49,12 +49,13 @@ static void  _e_fm_icon_meta_fill(E_Fm_Icon_Metadata *m, E_Smart_Data *sd);
 /* local subsystem globals */
 static Evas_Smart *e_smart = NULL;
 
-static pid_t       pid = -1;
 static Evas_List  *thumb_files = NULL;
 
 static Evas_List  *event_handlers = NULL;
 
+/*
 static Eet_Data_Descriptor *_e_fm_icon_meta_edd = NULL;
+*/
 
 /* externally accessible functions */
 EAPI int
@@ -123,7 +124,7 @@ e_fm_icon_file_get(Evas_Object *obj)
    E_Smart_Data *sd;
 
    sd = evas_object_smart_data_get(obj);
-   if (!sd) return;
+   if (!sd) return NULL;
 
    return sd->file;
 }
@@ -242,7 +243,7 @@ e_fm_icon_title_get(Evas_Object *obj)
    E_Smart_Data *sd;
 
    sd = evas_object_smart_data_get(obj);
-   if (!sd) return;
+   if (!sd) return NULL;
 
    return edje_object_part_text_get(sd->icon_object, "icon_title");
 }
@@ -323,7 +324,7 @@ e_fm_icon_meta_generate(Evas_Object *obj)
    E_Fm_Icon_Metadata *m;
 
    sd = evas_object_smart_data_get(obj);
-   if (!sd) return;
+   if (!sd) return NULL;
 
    m = calloc(1, sizeof(E_Fm_Icon_Metadata));
    if (!m) return NULL;

diff --git a/src/bin/e_fileman_smart.c b/src/bin/e_fileman_smart.c
index 6f3bb9e..80d9c45 100644 (file)
--- a/src/bin/e_fileman_smart.c
+++ b/src/bin/e_fileman_smart.c
@@ -872,7 +872,6 @@ static void
 _e_fm_file_menu_open(void *data, E_Menu *m, E_Menu_Item *mi)
 {
    E_Fm_Icon *icon;
-   char *exe;
    E_Fm_Assoc_App *assoc;
    Evas_List *l;
    icon = data;
@@ -2195,7 +2194,7 @@ _e_fm_icon_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info
    else if (ev->button == 3)
      {
        E_Menu      *mn,*mo;
-       E_Menu_Item *mi, *mio;
+       E_Menu_Item *mi;
        int x, y, w, h;
        Evas_List *l;
        E_Fm_Assoc_App *assoc;
@@ -2551,20 +2550,20 @@ _e_fm_icon_select_glob(E_Fm_Smart_Data *sd, char *glb)
    for (l = sd->files; l; l = l->next)
      {
        icon = l->data;
-       for(i = 0; i < globbuf.gl_pathc; i++)
+       for (i = 0; i < globbuf.gl_pathc; i++)
          {
-            char *file;
+            const char *file;
 
             file = ecore_file_get_file(globbuf.gl_pathv[i]);
-            if(!strcmp(icon->file->name, file))
+            if (!strcmp(icon->file->name, file))
               {
                  _e_fm_selections_add(l->data, l);
                  e_fm_icon_signal_emit(icon->icon_obj, "default", "");
-                 if(!anchor)
+                 if (!anchor)
                    {
                       evas_object_geometry_get(icon->icon_obj, &x, &y, &w, &h);
 
-                      if(!E_CONTAINS(sd->x, sd->y, sd->w, sd->h, x, y, w, h))
+                      if (!E_CONTAINS(sd->x, sd->y, sd->w, sd->h, x, y, w, h))
                         {
                            ev = E_NEW(E_Event_Fm_Reconfigure, 1);
                            if (ev)
@@ -2582,7 +2581,7 @@ _e_fm_icon_select_glob(E_Fm_Smart_Data *sd, char *glb)
          }
      }
 
-   if(anchor && ev)
+   if ((anchor) && (ev))
      ecore_event_add(E_EVENT_FM_RECONFIGURE, ev, NULL, NULL);
 }
 
@@ -2609,20 +2608,20 @@ static void
    else
      l = sd->files;
 
-   for(l; l; l = l->next)
+   for (; l; l = l->next)
      {
        icon = l->data;
-       if(icon->file->name[0] == c[0])
+       if (icon->file->name[0] == c[0])
          {
             _e_fm_selections_clear(sd);
             _e_fm_selections_add(l->data, l);
             goto position;
          }
      }
-   for(l = sd->files; l != sd->selection.current.ptr; l = l->next)
+   for (l = sd->files; l != sd->selection.current.ptr; l = l->next)
      {
        icon = l->data;
-       if(icon->file->name[0] == c[0])
+       if (icon->file->name[0] == c[0])
          {
             _e_fm_selections_clear(sd);
             _e_fm_selections_add(l->data, l);
@@ -2636,7 +2635,7 @@ static void
        Evas_Coord x, y, w, h;
        icon = l->data;
        evas_object_geometry_get(icon->icon_obj, &x, &y, &w, &h);
-       if(!E_CONTAINS(sd->x, sd->y, sd->w, sd->h, x, y, w, h))
+       if (!E_CONTAINS(sd->x, sd->y, sd->w, sd->h, x, y, w, h))
          {
             E_Event_Fm_Reconfigure *ev;
 
@@ -2695,9 +2694,9 @@ _e_fm_icon_select_up(E_Fm_Smart_Data *sd)
               {
                  int flag = 0;
                  icon = l->data;
-                 if(flag = icon->state.selected)
+                 if (flag = icon->state.selected)
                    {
-                      if(l->next->next)
+                      if (l->next->next)
                         icon = l->next->next->data;
                       else
                         icon = l->next->data;
@@ -2706,12 +2705,12 @@ _e_fm_icon_select_up(E_Fm_Smart_Data *sd)
                       _e_fm_selections_del(sd->selection.current.ptr->data);
                       x2 = x + 1;
                    }
-                 for(; l && (x != x2); l = l->prev)
+                 for (; l && (x != x2); l = l->prev)
                    {
                       icon = l->data;
                       evas_object_geometry_get(icon->icon_obj, &x2, NULL, NULL, NULL);
 
-                      if(icon->state.selected)
+                      if (icon->state.selected)
                         {
                            _e_fm_selections_del(l->data);
                            _e_fm_selections_current_set(l->data, l);
@@ -2719,7 +2718,7 @@ _e_fm_icon_select_up(E_Fm_Smart_Data *sd)
                       else
                         _e_fm_selections_add(l->data, l);
                    }
-                 if(flag && l)
+                 if (flag && l)
                    _e_fm_selections_current_set(l->data, l);
               }
             evas_object_geometry_get(icon->icon_obj, &x, &y, &w, &h);
@@ -2745,13 +2744,13 @@ _e_fm_icon_select_up(E_Fm_Smart_Data *sd)
 static void
 _e_fm_icon_select_down(E_Fm_Smart_Data *sd)
 {
-   Evas_List *l, *l2;
+   Evas_List *l;
 
-   if(!sd->selection.current.ptr)
+   if (!sd->selection.current.ptr)
      _e_fm_selections_add(sd->files->data, sd->files);
    else
      {
-       if(sd->selection.current.ptr->next) /* are we already at the end? */
+       if (sd->selection.current.ptr->next) /* are we already at the end? */
          {
 
             E_Fm_Icon *icon;
@@ -3037,10 +3036,10 @@ _e_fm_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
               }
             else if (!strcmp(ev->keyname, "BackSpace"))
               {
-                 char *str;
+                 const char *str;
                  str = NULL;
                  str = edje_object_part_text_get(sd->edje_obj, "text");
-                 if(str)
+                 if (str)
                    {
                       char *buf;
                       int size;
@@ -3052,10 +3051,10 @@ _e_fm_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
                       E_FREE(buf);
                    }
               }
-            else if (!strcmp(ev->keyname, "Up")
-                     || !strcmp(ev->keyname, "Down")
-                     || !strcmp(ev->keyname, "Escape")
-                     || !strcmp(ev->keyname, "Return"))
+            else if (!strcmp(ev->keyname, "Up") ||
+                     !strcmp(ev->keyname, "Down") ||
+                     !strcmp(ev->keyname, "Escape") ||
+                     !strcmp(ev->keyname, "Return"))
               {
 
                  edje_object_signal_emit(sd->edje_obj, "typebuf_hide", "");
@@ -3069,10 +3068,10 @@ _e_fm_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
               }
             else if (ev->string)
               {
-                 char *str;
+                 const char *str;
                  str = NULL;
                  str = edje_object_part_text_get(sd->edje_obj, "text");
-                 if(str)
+                 if (str)
                    {
                       char *buf;
                       int size;
@@ -3090,7 +3089,7 @@ _e_fm_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
                    }
               }
          }
-       else    if (!strcmp(ev->keyname, "Up"))
+       else if (!strcmp(ev->keyname, "Up"))
          {
             _e_fm_icon_select_up(sd);
          }