From 9506bc06dfe962e96b2a38fb7f8ec1ab20b0c3b2 Mon Sep 17 00:00:00 2001 From: Sebastian Dransfeld Date: Fri, 14 Sep 2007 22:22:29 +0000 Subject: [PATCH] Revert erronous changes. SVN revision: 31716 --- legacy/efreet/src/lib/efreet_ini.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/legacy/efreet/src/lib/efreet_ini.c b/legacy/efreet/src/lib/efreet_ini.c index 08addf21ba..8b60b683c3 100644 --- a/legacy/efreet/src/lib/efreet_ini.c +++ b/legacy/efreet/src/lib/efreet_ini.c @@ -56,11 +56,6 @@ efreet_ini_new(const char *file) if (!ini) return NULL; ini->data = efreet_ini_parse(file); - if (!ini->data) - { - FREE(ini); - return NULL; - } return ini; } @@ -98,15 +93,13 @@ efreet_ini_parse(const char *file) buf = read_buf = static_buf; read_len = static_buf_len; - data = ecore_hash_new(ecore_str_hash, ecore_str_compare); - if (!data) return NULL; + f = fopen(file, "rb"); + if (!f) return NULL; + data = ecore_hash_new(ecore_str_hash, ecore_str_compare); ecore_hash_free_key_cb_set(data, ECORE_FREE_CB(ecore_string_release)); ecore_hash_free_value_cb_set(data, ECORE_FREE_CB(ecore_hash_destroy)); - f = fopen(file, "rb"); - if (!f) return data; - /* if a line is longer than the buffer size, this \n will get overwritten. */ read_buf[read_len - 2] = '\n'; while (fgets(read_buf, read_len, f) != NULL) @@ -273,7 +266,7 @@ int efreet_ini_save(Efreet_Ini *ini, const char *file) { FILE *f; - if (!ini) return 0; + if (!ini || !ini->data) return 0; f = fopen(file, "wb"); if (!f) return 0; @@ -293,7 +286,7 @@ efreet_ini_save(Efreet_Ini *ini, const char *file) int efreet_ini_section_set(Efreet_Ini *ini, const char *section) { - if (!ini || !section) return 0; + if (!ini || !ini->data || !section) return 0; ini->section = ecore_hash_get(ini->data, section); return (ini->section ? 1 : 0);