Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_object_image.c evas_object_textblock.c
Log Message:
more warning fixes
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_image.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- evas_object_image.c 3 Oct 2005 13:53:11 -0000 1.32
+++ evas_object_image.c 8 Oct 2005 10:43:14 -0000 1.33
@@ -849,7 +849,6 @@
evas_object_image_pixels_import(Evas_Object *obj, Evas_Pixel_Import_Source
*pixels)
{
Evas_Object_Image *o;
- Evas_Rectangle *r;
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
return 0;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_textblock.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -3 -r1.109 -r1.110
--- evas_object_textblock.c 22 Sep 2005 03:00:48 -0000 1.109
+++ evas_object_textblock.c 8 Oct 2005 10:43:14 -0000 1.110
@@ -358,7 +358,6 @@
static char *
_strbuf_remove(char *s, int p, int p2, int *len, int *alloc)
{
- int l2;
int tlen;
char *tbuf;
@@ -1064,7 +1063,7 @@
static void
_format_param_parse(char *item, char **key, char **val)
{
- char *p, *pv;
+ char *p;
char *k, *v;
p = strchr(item, '=');
@@ -1461,6 +1460,7 @@
return 0;
}
+#if 0
static char *
_layout_next_char_jump(Ctxt *c, Evas_Object_Textblock_Item *it, char *str)
{
@@ -1477,6 +1477,7 @@
str = NULL;
return str;
}
+#endif
static int
_layout_last_item_ends_in_whitespace(Ctxt *c)
@@ -1531,7 +1532,7 @@
{
Evas_Object_Textblock_Item *pit, *new_it = NULL;
Evas_List *remove_items = NULL, *l;
- int index, p, ch, tw, th, inset, adv;
+ int index, tw, th, inset, adv;
/* it is not appended yet */
for (pit = (Evas_Object_Textblock_Item *)((Evas_Object_List
*)c->ln->items)->last;
@@ -1617,7 +1618,7 @@
int adv, inset, tw, th, new_line, empty_item;
int wrap, twrap, ch, index, white_stripped;
char *str;
- Evas_Object_Textblock_Item *it, *tit;
+ Evas_Object_Textblock_Item *it;
str = n->text;
new_line = 0;
@@ -1841,7 +1842,7 @@
{
Evas_Object_Textblock *o;
Ctxt ctxt, *c;
- Evas_Object_List *l, *ll;
+ Evas_Object_List *l;
Evas_List *removes = NULL;
Evas_Object_Textblock_Format *fmt = NULL;
int style_pad_l = 0, style_pad_r = 0, style_pad_t = 0, style_pad_b = 0;
@@ -2987,7 +2988,7 @@
{
Evas_Object_Textblock *o;
Evas_Object_Textblock_Node *n;
- int index, ch;
+ int index;
if (!cur) return;
o = (Evas_Object_Textblock *)(cur->obj->object_data);
@@ -3339,7 +3340,7 @@
}
else
{
- Evas_List *removes, *format_hump;
+ Evas_List *removes, *format_hump = NULL;
Evas_Textblock_Cursor tcur;
tcur.node = n2;
@@ -3658,7 +3659,6 @@
Evas_Object_Textblock_Item *it = NULL;
Evas_Object_Textblock_Format_Item *fi = NULL;
int x, y, w, h;
- int pos, ret;
if (!cur) return -1;
if (!cur->node) return -1;
@@ -3685,7 +3685,6 @@
{
Evas_Object_Textblock *o;
Evas_Object_List *l, *ll;
- Evas_Object_Textblock_Line *ln = NULL;
Evas_Object_Textblock_Item *it = NULL, *it_break = NULL;
Evas_Object_Textblock_Format_Item *fi = NULL;
@@ -3757,7 +3756,6 @@
{
Evas_Object_Textblock *o;
Evas_Object_List *l;
- Evas_Object_Textblock_Line *ln = NULL;
if (!cur) return -1;
o = (Evas_Object_Textblock *)(cur->obj->object_data);
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
