From 709c0003c843ea68246f7a5ff80d94ec0b0912e1 Mon Sep 17 00:00:00 2001 From: sebastid Date: Thu, 14 Apr 2005 10:52:58 +0000 Subject: [PATCH] Evas_List -> Ecore_List SVN revision: 14198 --- src/bin/e_apps.c | 58 ++++++++++++++-------------- src/modules/battery/e_mod_main.c | 9 ++--- src/modules/temperature/e_mod_main.c | 12 +++--- 3 files changed, 40 insertions(+), 39 deletions(-) diff --git a/src/bin/e_apps.c b/src/bin/e_apps.c index 37ca0154a..acd0c2306 100644 --- a/src/bin/e_apps.c +++ b/src/bin/e_apps.c @@ -32,7 +32,7 @@ struct _E_App_Callback static void _e_app_free (E_App *a); static void _e_app_fields_fill (E_App *a, const char *path); static void _e_app_fields_empty (E_App *a); -static Evas_List *_e_app_dir_file_list_get (E_App *a); +static Ecore_List *_e_app_dir_file_list_get (E_App *a); static E_App *_e_app_subapp_file_find (E_App *a, const char *file); static void _e_app_change (E_App *a, E_App_Change ch); static int _e_apps_cb_exit (void *data, int type, void *event); @@ -179,7 +179,8 @@ e_app_is_parent(E_App *parent, E_App *app) void e_app_subdir_scan(E_App *a, int scan_subdirs) { - Evas_List *files, *l; + Ecore_List *files; + char *s; char buf[PATH_MAX]; E_OBJECT_CHECK(a); @@ -196,12 +197,10 @@ e_app_subdir_scan(E_App *a, int scan_subdirs) } a->scanned = 1; files = _e_app_dir_file_list_get(a); - for (l = files; l; l = l->next) + while ((s = ecore_list_next(files))) { E_App *a2; - char *s; - s = l->data; a2 = NULL; snprintf(buf, sizeof(buf), "%s/%s", a->path, s); @@ -237,7 +236,7 @@ e_app_subdir_scan(E_App *a, int scan_subdirs) } free(s); } - files = evas_list_free(files); + ecore_list_destroy(files); } int @@ -549,10 +548,11 @@ _e_app_fields_empty(E_App *a) } } -static Evas_List * +static Ecore_List * _e_app_dir_file_list_get(E_App *a) { - Evas_List *files, *files2 = NULL, *l; + Ecore_List *files, *files2; + char *file; FILE *f; char buf[PATH_MAX]; @@ -561,6 +561,7 @@ _e_app_dir_file_list_get(E_App *a) f = fopen(buf, "rb"); if (f) { + files2 = ecore_list_new(); while (fgets(buf, sizeof(buf), f)) { int len; @@ -575,16 +576,16 @@ _e_app_dir_file_list_get(E_App *a) } if (len > 0) { - for (l = files; l; l = l->next) + while ((file = ecore_list_next(files))) { - if (!strcmp(buf, l->data)) + if (!strcmp(buf, file)) { - free(l->data); - files = evas_list_remove_list(files, l); + ecore_list_remove(files); + free(file); break; } } - files2 = evas_list_append(files2, strdup(buf)); + ecore_list_append(files2, strdup(buf)); } } } @@ -595,18 +596,20 @@ _e_app_dir_file_list_get(E_App *a) files2 = files; files = NULL; } - while (files) + if (files) { - char *s; - - s = files->data; - if (s[0] != '.') - files2 = evas_list_append(files2, s); - else - free(s); - files = evas_list_remove_list(files, files); + ecore_list_goto_first(files); + while ((file = ecore_list_next(files))) + { + if (file[0] != '.') + ecore_list_append(files2, file); + else + free(file); + } + ecore_list_destroy(files); } files = files2; + ecore_list_goto_first(files); return files; } @@ -776,18 +779,17 @@ _e_app_cb_monitor(void *data, Ecore_File_Monitor *em, static void _e_app_subdir_rescan(E_App *app) { - Evas_List *files, *l, *l2; - Evas_List *subapps = NULL, *changes = NULL; + Ecore_List *files; + Evas_List *subapps = NULL, *changes = NULL, *l, *l2; E_App_Change_Info *ch; char buf[PATH_MAX]; + char *s; files = _e_app_dir_file_list_get(app); - for (l = files; l; l = l->next) + while ((s = ecore_list_next(files))) { E_App *a2; - char *s; - s = l->data; a2 = _e_app_subapp_file_find(app, s); if (!a2) { @@ -832,7 +834,7 @@ _e_app_subdir_rescan(E_App *app) subapps = evas_list_append(subapps, a2); free(s); } - evas_list_free(files); + ecore_list_destroy(files); for (l = app->subapps; l; l = l->next) { E_App *a2; diff --git a/src/modules/battery/e_mod_main.c b/src/modules/battery/e_mod_main.c index 837ee5921..cc301d7a2 100644 --- a/src/modules/battery/e_mod_main.c +++ b/src/modules/battery/e_mod_main.c @@ -760,8 +760,9 @@ _battery_cb_check(void *data) static Status * _battery_linux_acpi_check(Battery *ef) { - Evas_List *bats; + Ecore_List *bats; char buf[4096], buf2[4096]; + char *name; int bat_max = 0; int bat_filled = 0; @@ -787,13 +788,10 @@ _battery_linux_acpi_check(Battery *ef) /* Read some information on first run. */ bats = ecore_file_ls("/proc/acpi/battery"); - while (bats) + while ((name = ecore_list_next(bats))) { FILE *f; - char *name; - name = bats->data; - bats = evas_list_remove_list(bats, bats); if ((!strcmp(name, ".")) || (!strcmp(name, ".."))) { free(name); @@ -853,6 +851,7 @@ _battery_linux_acpi_check(Battery *ef) } free(name); } + ecore_list_destroy(bats); if (ef->battery_prev_drain < 1) ef->battery_prev_drain = 1; if (bat_drain < 1) bat_drain = ef->battery_prev_drain; diff --git a/src/modules/temperature/e_mod_main.c b/src/modules/temperature/e_mod_main.c index 5d125fbda..2ae0b980c 100644 --- a/src/modules/temperature/e_mod_main.c +++ b/src/modules/temperature/e_mod_main.c @@ -776,13 +776,14 @@ _temperature_cb_check(void *data) Temperature *ef; Temperature_Face *face; int ret = 0; - Evas_List *therms, *l; + Ecore_List *therms; + Evas_List *l; int temp = 0; char buf[4096]; ef = data; therms = ecore_file_ls("/proc/acpi/thermal_zone"); - if (!therms) + if (ecore_list_is_empty(therms)) { FILE *f; @@ -797,14 +798,12 @@ _temperature_cb_check(void *data) } else { - while (therms) + char *name; + while ((name = ecore_list_next(therms))) { char units[32]; - char *name; FILE *f; - name = therms->data; - therms = evas_list_remove_list(therms, therms); snprintf(buf, sizeof(buf), "/proc/acpi/thermal_zone/%s/temperature", name); f = fopen(buf, "rb"); if (f) @@ -818,6 +817,7 @@ _temperature_cb_check(void *data) free(name); } } + ecore_list_destroy(therms); if (ret) { if (ef->have_temp != 1)