[EGIT] [core/efl] master 02/02: edje: add string "program_%p" (%p - edje_program pointer) to a default description of the program being build.

[Vyacheslav Reutskiy]

cedric pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=8efe24c87dbd2ff6e0f559c1eb4bb22cc275506e

commit 8efe24c87dbd2ff6e0f559c1eb4bb22cc275506e
Author: Vyacheslav Reutskiy <v.reuts...@samsung.com>
Date:   Thu Nov 7 18:01:52 2013 +0900

    edje: add string "program_%p" (%p - edje_program pointer) to a default 
description of the program being build.
    
    Fix deffect with a missing tokken 'name' in the program description block 
when
    generated by edje_cc.
    
    Reviewers: cedric, seoz
    
    CC: cedric
    
    Differential Revision: https://phab.enlightenment.org/D323
    
    Signed-off-by: Cedric Bail <cedric.b...@samsung.com>
---
 src/bin/edje/edje_cc_handlers.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index 88ab25e..a87b860 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -8893,6 +8893,7 @@ ob_collections_group_programs_program(void)
    Edje_Part_Collection *pc;
    Edje_Program *ep;
    Edje_Program_Parser *epp;
+   char *def_name;
 
    pc = eina_list_data_get(eina_list_last(edje_collections));
 
@@ -8903,6 +8904,10 @@ ob_collections_group_programs_program(void)
    epp = (Edje_Program_Parser *)ep;
    epp->can_override = EINA_FALSE;
 
+   /* generate new name */
+   def_name = alloca(strlen("program_") + strlen("0xFFFFFFFFFFFFFFFF") + 1);
+   sprintf(def_name, "program_%p", ep);
+   ep->name = strdup(def_name);
    _edje_program_insert(pc, ep);
 
    current_program = ep;
@@ -8926,6 +8931,7 @@ st_collections_group_programs_program_name(void)
    check_arg_count(1);
 
    pc = eina_list_data_get(eina_list_last(edje_collections));
+   if (current_program->name) free((void *)current_program->name);
    current_program->name = parse_str(0);
 
    _edje_program_check(current_program->name, current_program, 
pc->programs.fnmatch, pc->programs.fnmatch_count);

--