Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_container.c edje_edit.c edje_embryo.c
edje_message_queue.c edje_private.h edje_util.c edje_var.c
Log Message:
warning fixes
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_container.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- edje_container.c 24 Aug 2004 01:48:19 -0000 1.6
+++ edje_container.c 24 Aug 2004 10:06:32 -0000 1.7
@@ -6,7 +6,7 @@
_edje_container_relayout(Smart_Data *sd)
{
Evas_List *l;
- Evas_Coord x, y, w, h, sw, sh;
+ Evas_Coord x, y, w, h, sw;
if (sd->freeze > 0) return;
if (!sd->need_layout) return;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_edit.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- edje_edit.c 1 Jul 2004 03:46:05 -0000 1.2
+++ edje_edit.c 24 Aug 2004 10:06:32 -0000 1.3
@@ -155,37 +155,44 @@
Edje_Part_Collection *
edje_edit_part_collection_add(Edje_Edit_File *edf, char *collection_name)
{
+ return NULL;
}
Edje_Part_Collection *
edje_edit_part_collection_del(Edje_Edit_File *edf, char *collection_name)
{
+ return NULL;
}
Edje_Part *
edje_edit_part_add(Edje_Part_Collection *coll, char *part_name, int part_type)
{
+ return NULL;
}
Edje_Part *
edje_edit_part_del(Edje_Part_Collection *coll, char *part_name, int part_type)
{
+ return NULL;
}
Edje_Program *
edje_edit_program_add(Edje_Part_Collection *coll, char *prog_name)
{
+ return NULL;
}
Edje_Program *
edje_edit_program_del(Edje_Part_Collection *coll, char *prog_name)
{
+ return NULL;
}
Edje_Edit_Image *
edje_edit_image_add(Edje_Edit_File *edf, char *filename)
{
+ return NULL;
}
void
@@ -197,6 +204,7 @@
Edje_Edit_Image *
edje_edit_iamge_get_by_id(int id)
{
+ return NULL;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_embryo.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- edje_embryo.c 24 Aug 2004 02:11:38 -0000 1.25
+++ edje_embryo.c 24 Aug 2004 10:06:32 -0000 1.26
@@ -392,7 +392,6 @@
_edje_embryo_fn_set_min_size(Embryo_Program *ep, Embryo_Cell *params)
{
Edje *ed;
- int part_id = 0;
float f = 0.0;
double w = 0.0, h = 0.0;
@@ -417,7 +416,6 @@
_edje_embryo_fn_set_max_size(Embryo_Program *ep, Embryo_Cell *params)
{
Edje *ed;
- int part_id = 0;
float f = 0.0;
double w = 0.0, h = 0.0;
@@ -443,7 +441,6 @@
_edje_embryo_fn_stop_program(Embryo_Program *ep, Embryo_Cell *params)
{
Edje *ed;
- char *state1 = NULL, *state2 = NULL;
int program_id = 0;
Edje_Running_Program *runp;
Evas_List *l;
@@ -467,7 +464,6 @@
{
Edje *ed;
- char *state1 = NULL, *state2 = NULL;
int part_id = 0;
Edje_Real_Part *rp;
@@ -585,7 +581,6 @@
_edje_embryo_fn_run_program(Embryo_Program *ep, Embryo_Cell *params)
{
Edje *ed;
- char *state1 = NULL, *state2 = NULL;
int program_id = 0;
Edje_Program *pr;
@@ -1239,7 +1234,6 @@
if (fn != EMBRYO_FUNCTION_NONE)
{
void *pdata;
- int err;
printf("EDJE DEBUG: About to run script from program.\n");
embryo_parameter_string_push(ed->collection->script, sig);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_message_queue.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- edje_message_queue.c 12 Aug 2004 18:55:45 -0000 1.7
+++ edje_message_queue.c 24 Aug 2004 10:06:32 -0000 1.8
@@ -83,8 +83,7 @@
{
if (em->msg)
{
- char *ptr;
- int i, count;
+ int i;
switch (em->type)
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_private.h,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -3 -r1.68 -r1.69
--- edje_private.h 2 Jul 2004 10:17:25 -0000 1.68
+++ edje_private.h 24 Aug 2004 10:06:32 -0000 1.69
@@ -126,7 +126,7 @@
void _edje_var_list_float_prepend(Edje *ed, int id, double v);
void _edje_var_list_float_insert(Edje *ed, int id, int n, double v);
-char *_edje_var_list_nth_str_get(Edje *ed, int id, int n);
+const char *_edje_var_list_nth_str_get(Edje *ed, int id, int n);
void _edje_var_list_nth_str_set(Edje *ed, int id, int n, char *v);
void _edje_var_list_str_append(Edje *ed, int id, char *v);
void _edje_var_list_str_prepend(Edje *ed, int id, char *v);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_util.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- edje_util.c 12 Aug 2004 18:55:45 -0000 1.41
+++ edje_util.c 24 Aug 2004 10:06:33 -0000 1.42
@@ -456,7 +456,6 @@
edje_object_text_change_cb_set(Evas_Object *obj, void (*func) (void *data,
Evas_Object *obj, const char *part), void *data)
{
Edje *ed;
- Edje_Real_Part *rp;
ed = _edje_fetch(obj);
if (!ed) return;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_var.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- edje_var.c 19 Jun 2004 16:24:21 -0000 1.6
+++ edje_var.c 24 Aug 2004 10:06:33 -0000 1.7
@@ -47,7 +47,6 @@
{
Edje *ed;
Evas_List *tl2;
- int delete_me = 0;
ed = tl->data;
_edje_ref(ed);
@@ -808,21 +807,21 @@
}
}
-char *
+const char *
_edje_var_list_nth_str_get(Edje *ed, int id, int n)
{
- if (!ed) return 0;
- if (!ed->var_pool) return 0;
+ if (!ed) return NULL;
+ if (!ed->var_pool) return NULL;
id -= EDJE_VAR_MAGIC_BASE;
- if ((id < 0) || (id >= ed->var_pool->size)) return 0;
+ if ((id < 0) || (id >= ed->var_pool->size)) return NULL;
if (ed->var_pool->vars[id].type == EDJE_VAR_NONE)
ed->var_pool->vars[id].type = EDJE_VAR_LIST;
- else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST) return 0;
+ else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST) return NULL;
{
Edje_Var *var;
var = _edje_var_list_nth(ed, id, n);
- if (!var) return 0;
+ if (!var) return NULL;
return _edje_var_var_str_get(ed, var);
}
}
-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs