diff options
author | Daniel Kolesa <d.kolesa@samsung.com> | 2015-02-13 14:20:32 +0000 |
---|---|---|
committer | Daniel Kolesa <d.kolesa@samsung.com> | 2015-02-13 14:20:32 +0000 |
commit | 2b8bc02e1226594c8b7bb155bf8ddc42ce1961ce (patch) | |
tree | dfe147b1e13a32d0cf34c6f1fc5acbeb69467696 /src/bin/edje | |
parent | 06fe2fad0eb5bc16b58a448ba1c15cf9e53d9209 (diff) |
edje, eeze: compiler portability (use full ternary operator)
Diffstat (limited to 'src/bin/edje')
-rw-r--r-- | src/bin/edje/edje_cc_handlers.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c index 7b27b4f49c..2e1646588f 100644 --- a/src/bin/edje/edje_cc_handlers.c +++ b/src/bin/edje/edje_cc_handlers.c | |||
@@ -10187,6 +10187,7 @@ ob_collections_group_parts_part_description_link(void) | |||
10187 | Edje_Part_Collection_Parser *pcp; | 10187 | Edje_Part_Collection_Parser *pcp; |
10188 | Edje_Part_Parser *epp; | 10188 | Edje_Part_Parser *epp; |
10189 | Edje_Part_Description_Link *el; | 10189 | Edje_Part_Description_Link *el; |
10190 | const char *nm; | ||
10190 | 10191 | ||
10191 | pcp = eina_list_last_data_get(edje_collections); | 10192 | pcp = eina_list_last_data_get(edje_collections); |
10192 | epp = (Edje_Part_Parser*)current_part; | 10193 | epp = (Edje_Part_Parser*)current_part; |
@@ -10199,7 +10200,8 @@ ob_collections_group_parts_part_description_link(void) | |||
10199 | el->epp = epp; | 10200 | el->epp = epp; |
10200 | pcp->links = eina_list_append(pcp->links, el); | 10201 | pcp->links = eina_list_append(pcp->links, el); |
10201 | current_program->action = EDJE_ACTION_TYPE_STATE_SET; | 10202 | current_program->action = EDJE_ACTION_TYPE_STATE_SET; |
10202 | current_program->state = strdup(current_desc->state.name ?: "default"); | 10203 | nm = current_desc->state.name; |
10204 | current_program->state = strdup(nm ? nm : "default"); | ||
10203 | current_program->value = current_desc->state.value; | 10205 | current_program->value = current_desc->state.value; |
10204 | } | 10206 | } |
10205 | 10207 | ||
@@ -10238,7 +10240,8 @@ st_collections_group_parts_part_description_link_base(void) | |||
10238 | name = parse_str(0); | 10240 | name = parse_str(0); |
10239 | if (current_program->signal && pcp->link_hash) | 10241 | if (current_program->signal && pcp->link_hash) |
10240 | { | 10242 | { |
10241 | snprintf(buf, sizeof(buf), "%s\"\"\"%s", current_program->signal, current_program->source ?: ""); | 10243 | snprintf(buf, sizeof(buf), "%s\"\"\"%s", current_program->signal, |
10244 | current_program->source ? current_program->source: ""); | ||
10242 | eina_hash_list_remove(pcp->link_hash, buf, el); | 10245 | eina_hash_list_remove(pcp->link_hash, buf, el); |
10243 | } | 10246 | } |
10244 | if (!pcp->link_hash) | 10247 | if (!pcp->link_hash) |
@@ -10251,7 +10254,8 @@ st_collections_group_parts_part_description_link_base(void) | |||
10251 | free((void*)current_program->source); | 10254 | free((void*)current_program->source); |
10252 | current_program->source = name; | 10255 | current_program->source = name; |
10253 | } | 10256 | } |
10254 | snprintf(buf, sizeof(buf), "%s\"\"\"%s", current_program->signal, current_program->source ?: ""); | 10257 | snprintf(buf, sizeof(buf), "%s\"\"\"%s", current_program->signal, |
10258 | current_program->source ? current_program->source : ""); | ||
10255 | EINA_LIST_FOREACH(eina_hash_find(pcp->link_hash, buf), l, ell) | 10259 | EINA_LIST_FOREACH(eina_hash_find(pcp->link_hash, buf), l, ell) |
10256 | { | 10260 | { |
10257 | if (ell->epp == el->epp) | 10261 | if (ell->epp == el->epp) |