Following on the heels of my ever so successful set of evas patches,
here are a set for e. Some of these fix real bugs, most are obviously
masked by irregular occurrence (esp the uninitialised pointer ones).
I've left them all in one glob this time.
Anyway changes are:
e_actions.c: [BUG] Get rid of typo:
if (ret>1); -> if (ret>1)
e_wizard.c: [BUG] evas_key_modifier_is_set takes a Evas_Modifier*, not
an Evas* for first parameter. Note evas_key_modifier_is_set does not
check that the first parameter is an Evas_Modifier, so will happily use
the Evas* as and Evas_Modifier*. Hilarity ensures.
e_fm_custom.c: [Avoid GCCism] Don't do maths on void*s, cast (char*)
first.
e_int_config_theme.c: As above; void*->char*
e_int_border_prop.c: [64bit] Just check data2 directly, don't assign to
int first.
e_spectrum.c: Init vz to 0 always.
e_int_config_mousebindings.c: Set ev, bw, action and params to NULL
before using.
multiple modules [BUG]:
Set zone to NULL. Used uninitialised multiple places
multiple places [C89]:
More C89 compliance with function declarations (make them a C89
prototype).
Regards,
nash
Index: src/bin/e_actions.c
===================================================================
RCS file: /var/cvs/e/e17/apps/e/src/bin/e_actions.c,v
retrieving revision 1.109
diff -u -r1.109 e_actions.c
--- src/bin/e_actions.c 4 Sep 2007 16:48:11 -0000 1.109
+++ src/bin/e_actions.c 13 Sep 2007 02:39:41 -0000
@@ -567,7 +567,7 @@
else
max = E_MAXIMIZE_BOTH;
}
- if (ret > 1);
+ if (ret > 1)
{
if (v == 1)
{
Index: src/bin/e_desklock.c
===================================================================
RCS file: /var/cvs/e/e17/apps/e/src/bin/e_desklock.c,v
retrieving revision 1.43
diff -u -r1.43 e_desklock.c
--- src/bin/e_desklock.c 4 Jul 2007 11:11:02 -0000 1.43
+++ src/bin/e_desklock.c 13 Sep 2007 02:39:42 -0000
@@ -72,11 +72,11 @@
static int _e_desklock_cb_custom_desklock_exit(void *data, int type, void *event);
static int _e_desklock_cb_idle_timer(void *data);
-static void _e_desklock_passwd_update();
-static void _e_desklock_backspace();
-static void _e_desklock_delete();
-static int _e_desklock_zone_num_get();
-static int _e_desklock_check_auth();
+static void _e_desklock_passwd_update(void);
+static void _e_desklock_backspace(void);
+static void _e_desklock_delete(void);
+static int _e_desklock_zone_num_get(void);
+static int _e_desklock_check_auth(void);
static void _e_desklock_state_set(int state);
#ifdef HAVE_PAM
@@ -485,7 +485,7 @@
}
static void
-_e_desklock_passwd_update()
+_e_desklock_passwd_update(void)
{
char passwd_hidden[PASSWD_LEN] = "", *p, *pp;
E_Desklock_Popup_Data *edp;
@@ -506,7 +506,7 @@
}
static void
-_e_desklock_backspace()
+_e_desklock_backspace(void)
{
int len, val, pos;
@@ -525,13 +525,13 @@
}
static void
-_e_desklock_delete()
+_e_desklock_delete(void)
{
_e_desklock_backspace();
}
static int
-_e_desklock_zone_num_get()
+_e_desklock_zone_num_get(void)
{
int num;
Evas_List *l, *l2;
@@ -553,7 +553,7 @@
}
static int
-_e_desklock_check_auth()
+_e_desklock_check_auth(void)
{
if (!edd) return 0;
#ifdef HAVE_PAM
Index: src/bin/e_fm_custom.c
===================================================================
RCS file: /var/cvs/e/e17/apps/e/src/bin/e_fm_custom.c,v
retrieving revision 1.7
diff -u -r1.7 e_fm_custom.c
--- src/bin/e_fm_custom.c 23 Aug 2007 09:45:30 -0000 1.7
+++ src/bin/e_fm_custom.c 13 Sep 2007 02:39:42 -0000
@@ -180,7 +180,7 @@
char buf[PATH_MAX];
strcpy(buf, new_path);
- strcat(buf, l->data + strlen(path));
+ strcat(buf, (char*)l->data + strlen(path));
_e_fm2_custom_hash = evas_hash_del(_e_fm2_custom_hash,
l->data, cf2);
cf = evas_hash_find(_e_fm2_custom_hash, buf);
Index: src/bin/e_int_border_prop.c
===================================================================
RCS file: /var/cvs/e/e17/apps/e/src/bin/e_int_border_prop.c,v
retrieving revision 1.12
diff -u -r1.12 e_int_border_prop.c
--- src/bin/e_int_border_prop.c 14 Dec 2006 15:40:19 -0000 1.12
+++ src/bin/e_int_border_prop.c 13 Sep 2007 02:39:43 -0000
@@ -347,18 +347,16 @@
E_Dialog *dia;
Evas_Object *c, *o, *ob;
Evas_Coord w, h;
- int type;
dia = data;
if (!dia) return;
- type = (int)data2;
if (dia->content_object)
evas_object_del(dia->content_object);
c = e_widget_list_add(e_win_evas_get(dia->win), 0, 0);
- if (type == 0)
+ if (data2 == NULL)
{
o = _bd_icccm_create(dia, NULL);
e_widget_list_object_append(c, o, 1, 1, 0.0);
Index: src/bin/e_spectrum.c
===================================================================
RCS file: /var/cvs/e/e17/apps/e/src/bin/e_spectrum.c,v
retrieving revision 1.14
diff -u -r1.14 e_spectrum.c
--- src/bin/e_spectrum.c 4 Aug 2007 13:12:41 -0000 1.14
+++ src/bin/e_spectrum.c 13 Sep 2007 02:39:43 -0000
@@ -150,7 +150,7 @@
}
static void
-_e_spectrum_smart_init()
+_e_spectrum_smart_init(void)
{
if (_e_spectrum_smart) return;
{
@@ -266,7 +266,7 @@
int *data;
int i, j;
int r, g, b;
- float vx, vy, vz;
+ float vx, vy, vz = 0;
data = evas_object_image_data_get(sp->o_spectrum, 1);
if (!data)
Index: src/modules/conf/e_mod_main.c
===================================================================
RCS file: /var/cvs/e/e17/apps/e/src/modules/conf/e_mod_main.c,v
retrieving revision 1.2
diff -u -r1.2 e_mod_main.c
--- src/modules/conf/e_mod_main.c 18 Aug 2007 10:45:38 -0000 1.2
+++ src/modules/conf/e_mod_main.c 13 Sep 2007 02:39:44 -0000
@@ -91,7 +91,7 @@
static void
_e_mod_action_conf_cb(E_Object *obj, const char *params)
{
- E_Zone *zone;
+ E_Zone *zone = NULL;
if (obj)
{
Index: src/modules/conf_borders/e_int_config_borders.c
===================================================================
RCS file: /var/cvs/e/e17/apps/e/src/modules/conf_borders/e_int_config_borders.c,v
retrieving revision 1.2
diff -u -r1.2 e_int_config_borders.c
--- src/modules/conf_borders/e_int_config_borders.c 24 Jul 2007 18:47:24 -0000 1.2
+++ src/modules/conf_borders/e_int_config_borders.c 13 Sep 2007 02:39:44 -0000
@@ -1,6 +1,6 @@
#include "e.h"
-static E_Config_Dialog_View *_config_view_new();
+static E_Config_Dialog_View *_config_view_new(void);
static void *_create_data(E_Config_Dialog *cfd);
static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
@@ -54,7 +54,7 @@
}
static E_Config_Dialog_View *
-_config_view_new()
+_config_view_new(void)
{
E_Config_Dialog_View *v;
Index: src/modules/conf_mousebindings/e_int_config_mousebindings.c
===================================================================
RCS file: /var/cvs/e/e17/apps/e/src/modules/conf_mousebindings/e_int_config_mousebindings.c,v
retrieving revision 1.1
diff -u -r1.1 e_int_config_mousebindings.c
--- src/modules/conf_mousebindings/e_int_config_mousebindings.c 29 Jul 2007 02:12:50 -0000 1.1
+++ src/modules/conf_mousebindings/e_int_config_mousebindings.c 13 Sep 2007 02:39:46 -0000
@@ -1022,12 +1022,12 @@
_auto_apply_changes(E_Config_Dialog_Data *cfdata)
{
int n, g, a;
- E_Config_Binding_Mouse *eb;
- E_Config_Binding_Wheel *bw;
+ E_Config_Binding_Mouse *eb = NULL;
+ E_Config_Binding_Wheel *bw = NULL;
E_Action_Group *actg;
E_Action_Description *actd;
- const char **action, **params;
+ const char **action = "", **params = "";
if ((!cfdata->locals.cur) || (!cfdata->locals.cur[0])) return;
@@ -1443,8 +1443,8 @@
_grab_mouse_wheel_cb(void *data, int type, void *event)
{
Evas_List *l;
- E_Config_Binding_Wheel *bw;
- E_Config_Binding_Mouse *eb;
+ E_Config_Binding_Wheel *bw = NULL;
+ E_Config_Binding_Mouse *eb = NULL;
E_Config_Dialog_Data *cfdata;
Ecore_X_Event_Mouse_Wheel *ev;
int mod = E_BINDING_MODIFIER_NONE, n;
Index: src/modules/conf_theme/e_int_config_theme.c
===================================================================
RCS file: /var/cvs/e/e17/apps/e/src/modules/conf_theme/e_int_config_theme.c,v
retrieving revision 1.6
diff -u -r1.6 e_int_config_theme.c
--- src/modules/conf_theme/e_int_config_theme.c 23 Aug 2007 10:26:36 -0000 1.6
+++ src/modules/conf_theme/e_int_config_theme.c 13 Sep 2007 02:39:48 -0000
@@ -12,8 +12,8 @@
static Evas_Object *_basic_create_widgets (E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
static int _advanced_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static Evas_Object *_advanced_create_widgets (E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
-static Evas_List *_get_theme_categories_list();
-static Evas_List *_get_parts_list();
+static Evas_List *_get_theme_categories_list(void);
+static Evas_List *_get_parts_list(void);
struct _E_Config_Dialog_Data
{
@@ -505,7 +505,7 @@
}
static Evas_List *
-_get_parts_list()
+_get_parts_list(void)
{
Evas_List *parts = NULL;
@@ -544,7 +544,7 @@
}
static Evas_List *
-_get_theme_categories_list()
+_get_theme_categories_list(void)
{
Evas_List *themes, *tcl = NULL;
Evas_List *cats = NULL, *g = NULL, *cats2 = NULL;
@@ -677,7 +677,7 @@
}
if (p)
ret = e_widget_preview_edje_set(cfdata->o_preview, theme,
- p->data + strlen(c_label));
+ (char*)p->data + strlen(c_label));
if (!ret)
ret = e_widget_preview_edje_set(cfdata->o_preview, theme,
"e/desktop/background");
Index: src/modules/exebuf/e_exebuf.c
===================================================================
RCS file: /var/cvs/e/e17/apps/e/src/modules/exebuf/e_exebuf.c,v
retrieving revision 1.2
diff -u -r1.2 e_exebuf.c
--- src/modules/exebuf/e_exebuf.c 5 Aug 2007 04:41:55 -0000 1.2
+++ src/modules/exebuf/e_exebuf.c 13 Sep 2007 02:39:49 -0000
@@ -445,7 +445,7 @@
_e_exebuf_exec_term(void)
{
char tmp[EXEBUFLEN];
- const char *active_cmd;
+ const char *active_cmd = "";
if (exe_sel)
{
Index: src/modules/exebuf/e_mod_main.c
===================================================================
RCS file: /var/cvs/e/e17/apps/e/src/modules/exebuf/e_mod_main.c,v
retrieving revision 1.2
diff -u -r1.2 e_mod_main.c
--- src/modules/exebuf/e_mod_main.c 5 Aug 2007 08:07:39 -0000 1.2
+++ src/modules/exebuf/e_mod_main.c 13 Sep 2007 02:39:49 -0000
@@ -93,7 +93,7 @@
static void
_e_mod_action_exebuf_cb(E_Object *obj, const char *params)
{
- E_Zone *zone;
+ E_Zone *zone = NULL;
if (obj)
{
Index: src/modules/fileman/e_mod_main.c
===================================================================
RCS file: /var/cvs/e/e17/apps/e/src/modules/fileman/e_mod_main.c,v
retrieving revision 1.7
diff -u -r1.7 e_mod_main.c
--- src/modules/fileman/e_mod_main.c 13 Aug 2007 23:21:16 -0000 1.7
+++ src/modules/fileman/e_mod_main.c 13 Sep 2007 02:39:50 -0000
@@ -168,7 +168,7 @@
static void
_e_mod_action_fileman_cb(E_Object *obj, const char *params)
{
- E_Zone *zone;
+ E_Zone *zone = NULL;
if (obj)
{
Index: src/modules/winlist/e_mod_main.c
===================================================================
RCS file: /var/cvs/e/e17/apps/e/src/modules/winlist/e_mod_main.c,v
retrieving revision 1.2
diff -u -r1.2 e_mod_main.c
--- src/modules/winlist/e_mod_main.c 5 Aug 2007 08:07:39 -0000 1.2
+++ src/modules/winlist/e_mod_main.c 13 Sep 2007 02:39:50 -0000
@@ -89,7 +89,7 @@
static void
_e_mod_action_winlist_cb(E_Object *obj, const char *params)
{
- E_Zone *zone;
+ E_Zone *zone = NULL;
if (obj)
{
@@ -129,7 +129,7 @@
static void
_e_mod_action_winlist_mouse_cb(E_Object *obj, const char *params, Ecore_X_Event_Mouse_Button_Down *ev)
{
- E_Zone *zone;
+ E_Zone *zone = NULL;
if (obj)
{
@@ -175,7 +175,7 @@
static void
_e_mod_action_winlist_key_cb(E_Object *obj, const char *params, Ecore_X_Event_Key_Down *ev)
{
- E_Zone *zone;
+ E_Zone *zone = NULL;
if (obj)
{
Index: src/modules/wizard/e_wizard.c
===================================================================
RCS file: /var/cvs/e/e17/apps/e/src/modules/wizard/e_wizard.c,v
retrieving revision 1.3
diff -u -r1.3 e_wizard.c
--- src/modules/wizard/e_wizard.c 18 Aug 2007 15:55:48 -0000 1.3
+++ src/modules/wizard/e_wizard.c 13 Sep 2007 02:39:50 -0000
@@ -154,7 +154,7 @@
if (!o_content) return;
if (!strcmp(ev->keyname, "Tab"))
{
- if (evas_key_modifier_is_set(pop->evas, "Shift"))
+ if (evas_key_modifier_is_set(ev->modifiers, "Shift"))
e_widget_focus_jump(o_content, 0);
else
e_widget_focus_jump(o_content, 1);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
