Enlightenment CVS committal
Author : stffrdhrn
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_ipc_handlers.h
Log Message:
More fixes:
* those stringshare_del's were wrong
* Strings alloced by eet (ipc_dec) might be null check before freeing
* initialize variables
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_ipc_handlers.h,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -3 -r1.123 -r1.124
--- e_ipc_handlers.h 2 Mar 2006 13:10:20 -0000 1.123
+++ e_ipc_handlers.h 2 Mar 2006 14:07:07 -0000 1.124
@@ -426,9 +426,9 @@
END_INT3_STRING3_LIST_START()
#define END_INT3_STRING3_LIST_ITERATE(__v) \
- evas_stringshare_del(__v->str1); \
- evas_stringshare_del(__v->str2); \
- evas_stringshare_del(__v->str3); \
+ free(__v->str1); \
+ free(__v->str2); \
+ free(__v->str3); \
free(__v); \
}
#define END_INT3_STRING3_LIST_START() \
@@ -489,8 +489,8 @@
END_INT4_STRING2_LIST_START()
#define END_INT4_STRING2_LIST_ITERATE(__v) \
- evas_stringshare_del(__v->str1); \
- evas_stringshare_del(__v->str2); \
+ E_FREE(__v->str1); \
+ E_FREE(__v->str2); \
free(__v); \
} \
evas_list_free(dat);
@@ -551,8 +551,8 @@
END_INT5_STRING2_LIST_START()
#define END_INT5_STRING2_LIST_ITERATE(__v) \
- free(__v->str1); \
- free(__v->str2); \
+ E_FREE(__v->str1); \
+ E_FREE(__v->str2); \
free(__v); \
} \
evas_list_free(dat);
@@ -613,10 +613,10 @@
END_INT3_STRING4_LIST_START()
#define END_INT3_STRING4_LIST_ITERATE(__v) \
- evas_stringshare_del(__v->str1); \
- evas_stringshare_del(__v->str2); \
- evas_stringshare_del(__v->str3); \
- evas_stringshare_del(__v->str4); \
+ E_FREE(__v->str1); \
+ E_FREE(__v->str2); \
+ E_FREE(__v->str3); \
+ E_FREE(__v->str4); \
free(__v); \
} \
evas_list_free(dat);
@@ -660,7 +660,7 @@
E_Ipc_Str_4Int *__v; \
__v = l->data;
#define END_STRING_INT4_LIST(__v) \
- free(__v->str); \
+ E_FREE(__v->str); \
free(__v); \
} \
evas_list_free(dat); \
@@ -712,8 +712,8 @@
E_Ipc_2Str_Int *__v; \
__v = l->data;
#define END_STRING2_INT_LIST(__v) \
- free(__v->str1); \
- free(__v->str2); \
+ E_FREE(__v->str1); \
+ E_FREE(__v->str2); \
free(__v); \
} \
evas_list_free(dat); \
@@ -764,8 +764,8 @@
E_Ipc_2Str *__v; \
__v = l->data;
#define END_STRING2_LIST(__v) \
- free(__v->str1); \
- free(__v->str2); \
+ E_FREE(__v->str1); \
+ E_FREE(__v->str2); \
free(__v); \
} \
evas_list_free(dat); \
@@ -1600,6 +1600,8 @@
int count;
char * type;
int res;
+
+ res = 0;
RESPONSE(r, E_Response_Dirs_List);
/* FIXME - this is a mess, needs to be merged into macros... */
@@ -1608,7 +1610,6 @@
r->count = count - 1; /* leave off the "type" */
type = NULL;
- res = 0;
count = 0;
FOR(dat) {
if (dat == l)
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
