Enlightenment CVS committal
Author : e-taro
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_modules.c
Log Message:
Fix a handful of minor leaks
Should e_module_find and e_module_new take a const char * instead?
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_modules.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- e_int_config_modules.c 22 Jan 2006 18:14:51 -0000 1.21
+++ e_int_config_modules.c 5 Feb 2006 11:25:01 -0000 1.22
@@ -74,11 +74,11 @@
{
Evas_Object *obj;
E_Module *m;
- char *v;
+ const char *v;
obj = data;
- v = strdup(e_widget_ilist_selected_label_get(obj));
- m = e_module_find(v);
+ v = e_widget_ilist_selected_label_get(obj);
+ m = e_module_find((char *)v);
if (m)
{
if (m->func.config)
@@ -91,11 +91,11 @@
{
Evas_Object *obj;
E_Module *m;
- char *v;
+ const char *v;
obj = data;
- v = strdup(e_widget_ilist_selected_label_get(obj));
- m = e_module_find(v);
+ v = e_widget_ilist_selected_label_get(obj);
+ m = e_module_find((char *)v);
if (m)
{
if (m->func.about)
@@ -137,6 +137,7 @@
cfdata->modules = evas_list_append(cfdata->modules,
m);
}
}
+ ecore_list_destroy(dirs);
}
}
}
@@ -146,7 +147,6 @@
/* Free Lists */
if (l) evas_list_free(l);
- if (dirs != NULL) ecore_list_destroy(dirs);
return;
}
@@ -168,7 +168,18 @@
static void
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
- /* Free the cfdata */
+ Evas_List *l;
+
+ while (l = cfdata->modules)
+ {
+ CFModule *m;
+
+ m = l->data;
+ cfdata->modules = evas_list_remove_list(cfdata->modules, l);
+ free(m->name);
+ free(m->path);
+ E_FREE(m);
+ }
free(cfdata);
}
@@ -177,10 +188,10 @@
_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
E_Module *m;
- char *v;
+ const char *v;
int i;
- v = strdup(e_widget_ilist_selected_label_get(cfdata->gui.list));
+ v = e_widget_ilist_selected_label_get(cfdata->gui.list);
for (i = 0; i < evas_list_count(cfdata->modules); i++)
{
CFModule *cm;
@@ -193,10 +204,10 @@
e_widget_disabled_set(cfdata->gui.configure, 1);
e_widget_disabled_set(cfdata->gui.about, 1);
- m = e_module_find(v);
+ m = e_module_find((char *)v);
if (!m)
{
- m = e_module_new(v);
+ m = e_module_new((char *)v);
if (!m) break;
}
switch (cfdata->state)
@@ -328,12 +339,12 @@
E_Module *m;
E_Widget_Data *wd;
E_Config_Dialog_Data *cfdata;
- char *v;
+ const char *v;
int i;
cfdata = data;
- v = strdup(e_widget_ilist_selected_label_get(obj));
+ v = e_widget_ilist_selected_label_get(obj);
for (i = 0; i < evas_list_count(cfdata->modules); i++)
{
CFModule *cm;
@@ -371,7 +382,7 @@
}
e_widget_disabled_set(cfdata->gui.about, 1);
e_widget_disabled_set(cfdata->gui.configure, 1);
- m = e_module_find(v);
+ m = e_module_find((char *)v);
if (m)
{
if (m->func.about)
-------------------------------------------------------
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://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs