Fix the use of Rules_Load for loading each rule that is freed after

listing all the files from the rules directory ... We create a Rule_Load
structure for this now.

2 files changed, 30 insertions, 3 deletions

diff --git a/src/lib/rules/rules_load.c b/src/lib/rules/rules_load.c
index eb36ad6..ca21fe5 100644
--- a/src/lib/rules/rules_load.c
+++ b/src/lib/rules/rules_load.c
@@ -24,7 +24,7 @@ void
 rules_load_rule(void *data,
                 Conf *conf)
 {
-   Rules_Load *rl;
+   Rule_Load *rl;
    Rule *rule;
    Eina_Iterator *it;
    const char *file,
@@ -105,6 +105,7 @@ rules_load_rule(void *data,
    rl->cb.progress((void *)rl->cb.data, rl->rules, rule);
    rl->rules->rules = eina_inlist_append(rl->rules->rules,
                                          EINA_INLIST_GET(rule));
+   free(rl);
 }
 
 /**
@@ -165,15 +166,28 @@ rules_load_ls(void *data,
               const Eina_File_Direct_Info *info)
 {
    Rules_Load *rl;
-
+   Rule_Load *ruleload;
    rl = data;
    DBG("rl[%p] Rule file : %s", rl, info->path + info->name_start);
 
    /* We load file */
+   ruleload = calloc(1, sizeof(Rule_Load));
+   if (!ruleload)
+     {
+        ERR("Failed to allocate new Rule_Load structure");
+        return;
+     }
+
+   ruleload->rules = rl->rules;
+   ruleload->cb.progress = rl->cb.progress;
+   ruleload->cb.done = rl->cb.done;
+   ruleload->cb.error = rl->cb.error;
+   ruleload->cb.data = rl->cb.data;
+
    conf_load((char *)info->path,
              rules_load_rule,
              rules_load_rule_error,
-             rl);
+             ruleload);
 }
 
 /**
diff --git a/src/lib/rules/rules_private.h b/src/lib/rules/rules_private.h
index 1d74d95..2042e93 100644
--- a/src/lib/rules/rules_private.h
+++ b/src/lib/rules/rules_private.h
@@ -27,6 +27,19 @@ typedef struct _Rules_Load
    } cb;
 } Rules_Load;
 
+typedef struct _Rule_Load
+{
+   Rules *rules;
+
+   struct
+   {
+      Rules_Progress_Cb progress;
+      Rules_Done_Cb done;
+      Rules_Error_Cb error;
+      const void *data;
+   } cb;
+} Rule_Load;
+
 Eina_Bool rules_load_ls_filter(void *data, Eio_File *handler, const Eina_File_Direct_Info *info);
 void rules_load_ls(void *data, Eio_File *handler, const Eina_File_Direct_Info *info);
 void rules_load_ls_done(void *data, Eio_File *handler);