Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_apps.c e_border.c e_container.c e_file.c e_focus.c
e_iconify.h e_int_menus.c e_ipc.c e_main.c e_manager.c
e_menu.c e_module.c e_object.c e_path.c e_path.h
e_remote_main.c
Log Message:
clean up a lot of wranings.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_apps.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_apps.c 11 Dec 2004 04:02:26 -0000 1.9
+++ e_apps.c 23 Dec 2004 06:38:27 -0000 1.10
@@ -160,8 +160,7 @@
void
e_app_subdir_scan(E_App *a, int scan_subdirs)
{
- Evas_List *files, *files2 = NULL;
- FILE *f;
+ Evas_List *files;
char buf[4096];
E_OBJECT_CHECK(a);
@@ -514,8 +513,6 @@
len = strlen(buf);
if (len > 0)
{
- int ok = 0;
-
if (buf[len - 1] == '\n')
{
buf[len - 1] = 0;
@@ -639,7 +636,6 @@
while (changes)
{
E_App_Change_Info *ch;
- Evas_List *l;
ch = changes->data;
changes = evas_list_remove_list(changes, changes);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- e_border.c 23 Dec 2004 04:58:57 -0000 1.30
+++ e_border.c 23 Dec 2004 06:38:27 -0000 1.31
@@ -122,7 +122,6 @@
e_border_new(E_Container *con, Ecore_X_Window win, int first_map)
{
E_Border *bd;
- Ecore_Event_Handler *h;
Ecore_X_Window_Attributes *att;
bd = E_OBJECT_ALLOC(E_Border, _e_border_free);
@@ -1017,7 +1016,6 @@
_e_border_cb_signal_move_stop(void *data, Evas_Object *obj, const char
*emission, const char *source)
{
E_Border *bd;
- int x, y;
bd = data;
bd->moving = 0;
@@ -1140,7 +1138,6 @@
_e_border_cb_signal_resize_stop(void *data, Evas_Object *obj, const char
*emission, const char *source)
{
E_Border *bd;
- int x, y;
bd = data;
@@ -1682,7 +1679,6 @@
if (bd->client.border.changed)
{
Evas_Object *o;
- int iw, ih;
const char *path;
char buf[4096];
Evas_Coord cx, cy, cw, ch;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_container.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_container.c 21 Dec 2004 15:17:01 -0000 1.4
+++ e_container.c 23 Dec 2004 06:38:27 -0000 1.5
@@ -34,7 +34,6 @@
e_container_new(E_Manager *man)
{
E_Container *con;
- Ecore_Event_Handler *h;
con = E_OBJECT_ALLOC(E_Container, _e_container_free);
if (!con) return NULL;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_file.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_file.c 25 Nov 2004 03:37:44 -0000 1.1
+++ e_file.c 23 Dec 2004 06:38:27 -0000 1.2
@@ -90,7 +90,6 @@
e_file_realpath(char *file)
{
char buf[PATH_MAX];
- char *f;
struct stat st;
if (!realpath(file, buf) || stat(buf, &st)) return strdup("");
@@ -112,7 +111,6 @@
e_file_get_dir(char *file)
{
char *p;
- char *f;
char buf[PATH_MAX];
strncpy(buf, file, PATH_MAX);
@@ -157,7 +155,6 @@
e_file_readlink(char *link)
{
char buf[PATH_MAX];
- char *f;
int count;
if ((count = readlink(link, buf, sizeof(buf))) < 0) return NULL;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_focus.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_focus.c 25 Nov 2004 03:37:44 -0000 1.1
+++ e_focus.c 23 Dec 2004 06:38:27 -0000 1.2
@@ -1,7 +1,6 @@
#include "e.h"
/* local subsystem functions */
-static int _e_focus_cb_idle(void *data);
static int _e_focus_cb_window_focus_in(void *data, int ev_type, void *ev);
static int _e_focus_cb_window_focus_out(void *data, int ev_type, void *ev);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_iconify.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_iconify.h 21 Dec 2004 03:01:19 -0000 1.1
+++ e_iconify.h 23 Dec 2004 06:38:27 -0000 1.2
@@ -6,5 +6,7 @@
EAPI Evas_List *e_iconify_clients_list_get(void);
EAPI int e_iconify_border_iconfied(E_Border *bd);
+EAPI void e_iconify_border_add(E_Border *bd);
+EAPI void e_iconify_border_remove(E_Border *bd);
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_menus.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_int_menus.c 23 Dec 2004 04:58:57 -0000 1.6
+++ e_int_menus.c 23 Dec 2004 06:38:27 -0000 1.7
@@ -71,7 +71,6 @@
e_int_menus_apps_new(char *dir, int top)
{
E_Menu *m;
- E_Menu_Item *mi;
E_App *a;
m = e_menu_new();
@@ -90,7 +89,6 @@
e_int_menus_clients_new(void)
{
E_Menu *m;
- E_Menu_Item *mi;
m = e_menu_new();
e_menu_pre_activate_callback_set(m, _e_int_menus_clients_pre_cb, NULL);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_ipc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_ipc.c 5 Dec 2004 07:43:51 -0000 1.4
+++ e_ipc.c 23 Dec 2004 06:38:27 -0000 1.5
@@ -172,9 +172,7 @@
case E_IPC_OP_BG_SET:
{
char *file;
- char *valstr;
Evas_List *managers, *l;
- int cont;
file = malloc(e->size + 1);
file[e->size] = 0;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_main.c 21 Dec 2004 03:01:19 -0000 1.13
+++ e_main.c 23 Dec 2004 06:38:27 -0000 1.14
@@ -12,17 +12,17 @@
};
/* local subsystem functions */
-static void _e_main_shutdown_push(void (*func)(void));
+static void _e_main_shutdown_push(int (*func)(void));
static void _e_main_shutdown(int errorcode);
static int _e_main_dirs_init(void);
-static void _e_main_dirs_shutdown(void);
+static int _e_main_dirs_shutdown(void);
static int _e_main_screens_init(void);
-static void _e_main_screens_shutdown(void);
+static int _e_main_screens_shutdown(void);
static int _e_main_path_init(void);
-static void _e_main_path_shutdown(void);
+static int _e_main_path_shutdown(void);
static int _e_main_ipc_init(void);
-static void _e_main_ipc_shutdown(void);
+static int _e_main_ipc_shutdown(void);
static void _e_main_cb_x_fatal(void *data);
static int _e_main_cb_signal_exit(void *data, int ev_type, void *ev);
@@ -42,7 +42,7 @@
/* local subsystem globals */
#define MAX_LEVEL 32
-static void (*_e_main_shutdown_func[MAX_LEVEL]) (void);
+static int (*_e_main_shutdown_func[MAX_LEVEL]) (void);
static int _e_main_level = 0;
static Evas_List *_e_main_idler_before_list = NULL;
@@ -57,7 +57,6 @@
{
int ipc_failed = 0;
int i;
- char *display_name = NULL;
int nosplash = 0;
int nostartup = 0;
int nowelcome = 0;
@@ -348,7 +347,7 @@
/* local subsystem functions */
static void
-_e_main_shutdown_push(void (*func) (void))
+_e_main_shutdown_push(int (*func) (void))
{
_e_main_level++;
if (_e_main_level > MAX_LEVEL)
@@ -413,7 +412,7 @@
homedir = e_user_homedir_get();
if (!homedir) return 0;
- for (i = 0; i < (sizeof(dirs) / sizeof(char *)); i++)
+ for (i = 0; i < (int)(sizeof(dirs) / sizeof(char *)); i++)
{
snprintf(buf, sizeof(buf), dirs[i], homedir);
if (!e_file_mkpath(buf))
@@ -443,9 +442,10 @@
return 1;
}
-static void
+static int
_e_main_dirs_shutdown(void)
{
+ return 1;
}
static int
@@ -518,10 +518,11 @@
return 1;
}
-static void
+static int
_e_main_screens_shutdown(void)
{
e_manager_shutdown();
+ return 1;
}
static int
@@ -569,7 +570,7 @@
return 1;
}
-static void
+static int
_e_main_path_shutdown(void)
{
if (path_data)
@@ -597,6 +598,7 @@
e_object_unref(E_OBJECT(path_init));
path_init = NULL;
}
+ return 1;
}
static int
@@ -610,10 +612,11 @@
return 1;
}
-static void
+static int
_e_main_ipc_shutdown(void)
{
e_ipc_shutdown();
+ return 1;
}
static void
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_manager.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_manager.c 25 Nov 2004 03:37:44 -0000 1.1
+++ e_manager.c 23 Dec 2004 06:38:27 -0000 1.2
@@ -4,6 +4,7 @@
static void _e_manager_free(E_Manager *man);
static int _e_manager_cb_window_show_request(void *data, int ev_type, void
*ev);
+#if 0 /* use later - maybe */
static int _e_manager_cb_window_destroy(void *data, int ev_type, void *ev);
static int _e_manager_cb_window_hide(void *data, int ev_type, void *ev);
static int _e_manager_cb_window_reparent(void *data, int ev_type, void *ev);
@@ -17,6 +18,7 @@
static int _e_manager_cb_window_colormap(void *data, int ev_type, void *ev);
static int _e_manager_cb_window_shape(void *data, int ev_type, void *ev);
static int _e_manager_cb_client_message(void *data, int ev_type, void *ev);
+#endif
/* local subsystem globals */
static Evas_List *managers = NULL;
@@ -176,16 +178,18 @@
return 1;
}
-static int _e_manager_cb_window_destroy(void *data, int ev_type, void *ev){}
-static int _e_manager_cb_window_hide(void *data, int ev_type, void *ev){}
-static int _e_manager_cb_window_reparent(void *data, int ev_type, void *ev){}
-static int _e_manager_cb_window_create(void *data, int ev_type, void *ev){}
-static int _e_manager_cb_window_configure_request(void *data, int ev_type,
void *ev){}
-static int _e_manager_cb_window_configure(void *data, int ev_type, void *ev){}
-static int _e_manager_cb_window_gravity(void *data, int ev_type, void *ev){}
-static int _e_manager_cb_window_stack(void *data, int ev_type, void *ev){}
-static int _e_manager_cb_window_stack_request(void *data, int ev_type, void
*ev){}
-static int _e_manager_cb_window_property(void *data, int ev_type, void *ev){}
-static int _e_manager_cb_window_colormap(void *data, int ev_type, void *ev){}
-static int _e_manager_cb_window_shape(void *data, int ev_type, void *ev){}
-static int _e_manager_cb_client_message(void *data, int ev_type, void *ev){}
+#if 0 /* use later - maybe */
+static int _e_manager_cb_window_destroy(void *data, int ev_type, void
*ev){return 1;}
+static int _e_manager_cb_window_hide(void *data, int ev_type, void *ev){return
1;}
+static int _e_manager_cb_window_reparent(void *data, int ev_type, void
*ev){return 1;}
+static int _e_manager_cb_window_create(void *data, int ev_type, void
*ev){return 1;}
+static int _e_manager_cb_window_configure_request(void *data, int ev_type,
void *ev){return 1;}
+static int _e_manager_cb_window_configure(void *data, int ev_type, void
*ev){return 1;}
+static int _e_manager_cb_window_gravity(void *data, int ev_type, void
*ev){return 1;}
+static int _e_manager_cb_window_stack(void *data, int ev_type, void
*ev){return 1;}
+static int _e_manager_cb_window_stack_request(void *data, int ev_type, void
*ev){return 1;}
+static int _e_manager_cb_window_property(void *data, int ev_type, void
*ev){return 1;}
+static int _e_manager_cb_window_colormap(void *data, int ev_type, void
*ev){return 1;}
+static int _e_manager_cb_window_shape(void *data, int ev_type, void
*ev){return 1;}
+static int _e_manager_cb_client_message(void *data, int ev_type, void
*ev){return 1;}
+#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_menu.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_menu.c 22 Dec 2004 10:41:03 -0000 1.4
+++ e_menu.c 23 Dec 2004 06:38:27 -0000 1.5
@@ -355,7 +355,7 @@
{
E_OBJECT_CHECK(mi);
if (((mi->separator) && (sep)) ||
- (!mi->separator) && (!sep)) return;
+ ((!mi->separator) && (!sep))) return;
mi->separator = sep;
mi->changed = 1;
mi->menu->changed = 1;
@@ -366,7 +366,7 @@
{
E_OBJECT_CHECK(mi);
if (((mi->check) && (chk)) ||
- (!mi->check) && (!chk)) return;
+ ((!mi->check) && (!chk))) return;
mi->check = chk;
mi->changed = 1;
mi->menu->changed = 1;
@@ -377,7 +377,7 @@
{
E_OBJECT_CHECK(mi);
if (((mi->radio) && (rad)) ||
- (!mi->radio) && (!rad)) return;
+ ((!mi->radio) && (!rad))) return;
mi->radio = rad;
mi->changed = 1;
mi->menu->changed = 1;
@@ -387,7 +387,7 @@
e_menu_item_radio_group_set(E_Menu_Item *mi, int radg)
{
E_OBJECT_CHECK(mi);
- if ((mi->radio_group) == (radg)) return;
+ if (mi->radio_group == radg) return;
mi->radio_group = radg;
mi->changed = 1;
mi->menu->changed = 1;
@@ -998,7 +998,7 @@
_e_menu_items_layout_update(E_Menu *m)
{
Evas_List *l;
- Evas_Coord bw, bh, mw, mh, ww, hh;
+ Evas_Coord bw, bh, mw, mh;
int toggles_on = 0;
int icons_on = 0;
int labels_on = 0;
@@ -1908,7 +1908,6 @@
_e_menu_cb_mouse_down(void *data, int type, void *event)
{
Ecore_X_Event_Mouse_Button_Down *ev;
- Evas_List *l;
ev = event;
if (ev->win != _e_menu_win) return 1;
@@ -1919,7 +1918,6 @@
_e_menu_cb_mouse_up(void *data, int type, void *event)
{
Ecore_X_Event_Mouse_Button_Up *ev;
- Evas_List *l;
double t;
int ret;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_module.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_module.c 6 Dec 2004 15:51:23 -0000 1.7
+++ e_module.c 23 Dec 2004 06:38:27 -0000 1.8
@@ -74,7 +74,7 @@
{
E_Module *m;
char buf[4096];
- const char *modpath, *tmp, *p;
+ char *modpath;
Evas_List *l;
int in_list = 0;
@@ -197,6 +197,7 @@
break;
}
}
+ return 1;
}
int
@@ -348,7 +349,7 @@
static E_Menu *
_e_module_control_menu_new(E_Module *mod)
{
- E_Menu *m, *subm;
+ E_Menu *m;
E_Menu_Item *mi;
m = e_menu_new();
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_object.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_object.c 25 Nov 2004 03:37:44 -0000 1.1
+++ e_object.c 23 Dec 2004 06:38:27 -0000 1.2
@@ -33,7 +33,7 @@
E_Object *obj;
obj = calloc(1, size);
- if (!obj) return;
+ if (!obj) return NULL;
obj->magic = E_OBJECT_MAGIC;
obj->references = 1;
obj->cleanup_func = cleanup_func;
@@ -77,14 +77,19 @@
{
E_OBJECT_CHECK(obj);
obj->references++;
+ return obj->references;
}
int
e_object_unref(E_Object *obj)
{
+ int ref;
+
E_OBJECT_CHECK(obj);
obj->references--;
+ ref = obj->references;
if (obj->references <= 0) e_object_free(obj);
+ return ref;
}
int
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_path.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_path.c 25 Nov 2004 03:37:44 -0000 1.1
+++ e_path.c 23 Dec 2004 06:38:27 -0000 1.2
@@ -144,7 +144,7 @@
}
}
-const char *
+char *
e_path_find(E_Path *ep, const char *file)
{
Evas_List *l;
@@ -192,7 +192,7 @@
if (!evas) return;
for (l = ep->dir_list; l; l = l->next)
{
- char *p, *rp;
+ char *p;
p = l->data;
if (p) evas_font_path_append(evas, p);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_path.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_path.h 25 Nov 2004 05:31:20 -0000 1.2
+++ e_path.h 23 Dec 2004 06:38:27 -0000 1.3
@@ -16,7 +16,7 @@
EAPI void e_path_path_append(E_Path *ep, const char *path);
EAPI void e_path_path_prepend(E_Path *ep, const char *path);
EAPI void e_path_path_remove(E_Path *ep, const char *path);
-EAPI const char *e_path_find(E_Path *ep, const char *file);
+EAPI char *e_path_find(E_Path *ep, const char *file); /* for conveience
this doesnt return a malloc'd string. it's a static buffer, so a new call will
replace this buffer, but thsi means there is no need to free the return */
EAPI void e_path_evas_append(E_Path *ep, Evas *evas);
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_remote_main.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_remote_main.c 5 Dec 2004 07:43:51 -0000 1.5
+++ e_remote_main.c 23 Dec 2004 06:38:27 -0000 1.6
@@ -171,7 +171,7 @@
char *v;
int j;
- for (j = 0; j < (sizeof(handlers) / sizeof(E_IPC_Opt_Handler)); j++)
+ for (j = 0; j < (int)(sizeof(handlers) / sizeof(E_IPC_Opt_Handler));
j++)
{
E_IPC_Opt_Handler *handler;
@@ -249,17 +249,17 @@
char *p;
p = e->data;
- while (p < (e->data + e->size))
+ while (p < (char *)(e->data + e->size))
{
char *name;
char enabled;
name = p;
p += strlen(name);
- if (p < (e->data + e->size))
+ if (p < (char *)(e->data + e->size))
{
p++;
- if (p < (e->data + e->size))
+ if (p < (char *)(e->data + e->size))
{
enabled = *p;
p++;
@@ -290,10 +290,10 @@
int parsize = 0, opsize = 0;
printf("OPTIONS:\n");
- for (j = 0; j < (sizeof(handlers) / sizeof(E_IPC_Opt_Handler)); j++)
+ for (j = 0; j < (int)(sizeof(handlers) / sizeof(E_IPC_Opt_Handler)); j++)
{
handler = &handlers[j];
- if (strlen(handler->option) > parsize) parsize =
strlen(handler->option);
+ if ((int)strlen(handler->option) > parsize) parsize =
strlen(handler->option);
l = 0;
for (k = 0; k < handler->num_params; k++)
{
@@ -302,7 +302,7 @@
}
if (l > opsize) opsize = l;
}
- for (j = 0; j < (sizeof(handlers) / sizeof(E_IPC_Opt_Handler)); j++)
+ for (j = 0; j < (int)(sizeof(handlers) / sizeof(E_IPC_Opt_Handler)); j++)
{
handler = &handlers[j];
printf(" %s", handler->option);
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
