Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_main.c edje_private.h edje_util.c
Log Message:
more memory management cleanups. fixed some warnings.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_main.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- edje_main.c 12 Jan 2004 17:41:47 -0000 1.27
+++ edje_main.c 12 Jan 2004 19:21:25 -0000 1.28
@@ -18,6 +18,8 @@
if (!initted) return;
_edje_edd_free();
+ _edje_color_class_members_free();
+ _edje_text_class_members_free();
initted = 0;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_private.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- edje_private.h 12 Jan 2004 17:41:48 -0000 1.54
+++ edje_private.h 12 Jan 2004 19:21:25 -0000 1.55
@@ -590,9 +590,13 @@
void _edje_color_class_member_add(Edje *ed, char *color_class);
void _edje_color_class_member_del(Edje *ed, char *color_class);
void _edje_color_class_on_del(Edje *ed, Edje_Part *ep);
+void _edje_color_class_members_free(void);
+
Edje_Text_Class *_edje_text_class_find(Edje *ed, char *text_class);
void _edje_text_class_member_add(Edje *ed, char *text_class);
void _edje_text_class_member_del(Edje *ed, char *text_class);
+void _edje_text_class_members_free(void);
+
Edje *_edje_fetch(Evas_Object *obj);
int _edje_glob_match(char *str, char *glob);
int _edje_freeze(Edje *ed);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_util.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- edje_util.c 27 Dec 2003 10:51:02 -0000 1.31
+++ edje_util.c 12 Jan 2004 19:21:25 -0000 1.32
@@ -1015,7 +1015,7 @@
{
Evas_List *l;
- if ((!ed) || (!color_class)) return;
+ if ((!ed) || (!color_class)) return NULL;
for (l = ed->color_classes; l; l = l->next)
{
Edje_Color_Class *cc;
@@ -1042,7 +1042,7 @@
void
_edje_color_class_member_del(Edje *ed, char *color_class)
{
- Evas_List *members, *tmp = NULL;
+ Evas_List *members;
if ((!ed) || (!color_class)) return;
members = evas_hash_find(_edje_color_class_member_hash, color_class);
@@ -1054,6 +1054,15 @@
}
void
+_edje_color_class_members_free(void)
+{
+ if (!_edje_color_class_member_hash) return;
+
+ evas_hash_free(_edje_color_class_member_hash);
+ _edje_color_class_member_hash = NULL;
+}
+
+void
_edje_color_class_on_del(Edje *ed, Edje_Part *ep)
{
Evas_List *tmp;
@@ -1077,7 +1086,7 @@
{
Evas_List *l;
- if ((!ed) || (!text_class)) return;
+ if ((!ed) || (!text_class)) return NULL;
for (l = ed->text_classes; l; l = l->next)
{
Edje_Text_Class *tc;
@@ -1104,7 +1113,7 @@
void
_edje_text_class_member_del(Edje *ed, char *text_class)
{
- Evas_List *members, *tmp = NULL;
+ Evas_List *members;
if ((!ed) || (!text_class)) return;
members = evas_hash_find(_edje_text_class_member_hash, text_class);
@@ -1115,6 +1124,15 @@
if (members) _edje_text_class_member_hash =
evas_hash_add(_edje_text_class_member_hash, text_class, members);
}
+void
+_edje_text_class_members_free(void)
+{
+ if (!_edje_text_class_member_hash) return;
+
+ evas_hash_free(_edje_text_class_member_hash);
+ _edje_text_class_member_hash = NULL;
+}
+
Edje *
_edje_fetch(Evas_Object *obj)
{
-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
