From 8bb9cce1ca4b256fa9854b68836630dde78592c4 Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Sun, 4 Feb 2018 18:39:33 +0100 Subject: [PATCH] Revert "Eolian api usage fix." This reverts commit 318ee74c88eee347eeac9da237af5b562c908b1e. The changed there let to segfaults here, and it barelly worked, so new changes are done after that, to get clouseau back to work mode now. --- src/lib/clouseau_debug.c | 8 ++------ src/lib/extensions/objects_introspection/main.c | 5 +---- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/lib/clouseau_debug.c b/src/lib/clouseau_debug.c index 8d008fe..4f7ff09 100644 --- a/src/lib/clouseau_debug.c +++ b/src/lib/clouseau_debug.c @@ -186,7 +186,6 @@ _class_find_by_name(const char *eo_klname, const Eolian_Unit **unit) return info->kl; } - Eolian *eos = eolian_new(); char *klname = strdup(eo_klname); Eina_Strbuf *buf = eina_strbuf_new(); @@ -196,7 +195,7 @@ _class_find_by_name(const char *eo_klname, const Eolian_Unit **unit) char *tmp = eina_strbuf_string_steal(buf); eina_strbuf_free(buf); eina_str_tolower(&tmp); - *unit = eolian_file_parse(eos, tmp); + *unit = eolian_file_parse(tmp); free(tmp); tmp = klname; @@ -219,7 +218,6 @@ end: eina_hash_set(_eolian_kls_hash, eo_klname, info); } free(klname); - eolian_free(eos); return kl; } @@ -1079,15 +1077,13 @@ clouseau_debug_init(void) eolian_init(); evas_init(); - Eolian *eos = eolian_new(); _eolian_kls_hash = eina_hash_string_superfast_new(NULL); - eolian_system_directory_scan(eos); + eolian_system_directory_scan(); eina_debug_opcodes_register(NULL, _debug_ops(), NULL, NULL); printf("%s - In\n", __FUNCTION__); - eolian_free(eos); return EINA_TRUE; } diff --git a/src/lib/extensions/objects_introspection/main.c b/src/lib/extensions/objects_introspection/main.c index f590675..cea4201 100644 --- a/src/lib/extensions/objects_introspection/main.c +++ b/src/lib/extensions/objects_introspection/main.c @@ -1161,8 +1161,6 @@ extension_start(Clouseau_Extension *ext, Eo *parent) eina_init(); eolian_init(); - Eolian *eos = eolian_new(); - ext->data = inst; ext->session_changed_cb = _session_changed; @@ -1177,12 +1175,11 @@ extension_start(Clouseau_Extension *ext, Eo *parent) memset(&(inst->snapshot), 0, sizeof(inst->snapshot)); - eolian_directory_scan(eos, EOLIAN_EO_DIR); + eolian_directory_scan(EOLIAN_EO_DIR); _config_load(ext); ext->ui_object = _ui_get(ext, parent); - eolian_free(eos); return !!ext->ui_object; }