Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_util.c
Log Message:
null ptr checks
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_util.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- edje_util.c 30 Nov 2005 15:36:34 -0000 1.69
+++ edje_util.c 5 Dec 2005 10:08:30 -0000 1.70
@@ -78,7 +78,8 @@
Edje_Data *di;
di = l->data;
- if (!strcmp(di->key, key)) return (const char *)di->value;
+ if ((di->key) && (!strcmp(di->key, key)))
+ return (const char *)di->value;
}
return NULL;
}
@@ -244,7 +245,7 @@
for (l = ed->color_classes; l; l = l->next)
{
cc = l->data;
- if (!strcmp(cc->name, color_class))
+ if ((cc->name) && (!strcmp(cc->name, color_class)))
{
if ((cc->r == r) && (cc->g == g) &&
(cc->b == b) && (cc->a == a) &&
@@ -338,7 +339,7 @@
return;
}
- if ((tc->size == size) && (!strcmp(tc->font, font)))
+ if ((tc->size == size) && (tc->font) && (!strcmp(tc->font, font)))
return;
free(tc->font);
tc->font = strdup(font);
@@ -385,7 +386,7 @@
for (l = ed->text_classes; l; l = l->next)
{
tc = l->data;
- if (!strcmp(tc->name, text_class))
+ if ((tc->name) && (!strcmp(tc->name, text_class)))
{
if ((tc->font) && (font) &&
(!strcmp(tc->font, font)) &&
@@ -1378,8 +1379,8 @@
{
Edje_Real_Part *rp;
- rp = l->data;
- if (!strcmp(rp->part->name, part)) return rp;
+ rp = l->data;
+ if ((rp->part->name) && (!strcmp(rp->part->name, part))) return rp;
}
return NULL;
}
@@ -1395,7 +1396,7 @@
Edje_Color_Class *cc;
cc = l->data;
- if (!strcmp(color_class, cc->name)) return cc;
+ if ((cc->name) && (!strcmp(color_class, cc->name))) return cc;
}
return evas_hash_find(_edje_color_class_hash, color_class);
}
@@ -1504,7 +1505,7 @@
Edje_Text_Class *tc;
tc = l->data;
- if (!strcmp(text_class, tc->name)) return tc;
+ if ((tc->name) && (!strcmp(text_class, tc->name))) return tc;
}
return evas_hash_find(_edje_text_class_hash, text_class);
}
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
