summaryrefslogtreecommitdiff
path: root/ivi-shell/ivi-layout-transition.c
diff options
context:
space:
mode:
authorCarlos Olmedo Escobar <carlos.olmedo.e@gmail.com>2015-03-02 13:24:36 +0100
committerPekka Paalanen <pekka.paalanen@collabora.co.uk>2015-03-02 15:13:25 +0200
commit703f5020369c294ee80a1a03270275e56e4965ac (patch)
treed63fe1be2512ffaa9687649b76c113cb927b97b9 /ivi-shell/ivi-layout-transition.c
parent5ba1e1d137b73c7d67a5894f0bc4abf538c8b4f0 (diff)
downloadweston-703f5020369c294ee80a1a03270275e56e4965ac.tar.gz
ivi-layout: separate declarations from code
Thanks Pekka for pointing that out. Signed-off-by: Carlos Olmedo Escobar <carlos.olmedo.e@gmail.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Diffstat (limited to 'ivi-shell/ivi-layout-transition.c')
-rw-r--r--ivi-shell/ivi-layout-transition.c21
1 files changed, 15 insertions, 6 deletions
diff --git a/ivi-shell/ivi-layout-transition.c b/ivi-shell/ivi-layout-transition.c
index 904e8d61..f691d35c 100644
--- a/ivi-shell/ivi-layout-transition.c
+++ b/ivi-shell/ivi-layout-transition.c
@@ -327,11 +327,14 @@ create_move_resize_view_transition(
ivi_layout_transition_destroy_func destroy_func,
uint32_t duration)
{
- struct ivi_layout_transition *transition = create_layout_transition();
+ struct ivi_layout_transition *transition;
+ struct move_resize_view_data *data;
+
+ transition = create_layout_transition();
if (transition == NULL)
return NULL;
- struct move_resize_view_data *data = malloc(sizeof(*data));
+ data = malloc(sizeof(*data));
if (data == NULL) {
weston_log("%s: memory allocation fails\n", __func__);
return NULL;
@@ -452,11 +455,14 @@ create_fade_view_transition(
ivi_layout_transition_destroy_func destroy_func,
uint32_t duration)
{
- struct ivi_layout_transition *transition = create_layout_transition();
+ struct ivi_layout_transition *transition;
+ struct fade_view_data *data;
+
+ transition = create_layout_transition();
if (transition == NULL)
return NULL;
- struct fade_view_data *data = malloc(sizeof(*data));
+ data = malloc(sizeof(*data));
if (data == NULL) {
weston_log("%s: memory allocation fails\n", __func__);
return NULL;
@@ -678,11 +684,14 @@ create_move_layer_transition(
ivi_layout_transition_destroy_user_func destroy_user_func,
uint32_t duration)
{
- struct ivi_layout_transition *transition = create_layout_transition();
+ struct ivi_layout_transition *transition;
+ struct move_layer_data *data;
+
+ transition = create_layout_transition();
if (transition == NULL)
return NULL;
- struct move_layer_data *data = malloc(sizeof(*data));
+ data = malloc(sizeof(*data));
if (data == NULL) {
weston_log("%s: memory allocation fails\n", __func__);
return NULL;