From 7e3286b4edbaba81fda348a08fe0e33938fce3e3 Mon Sep 17 00:00:00 2001 From: Cedric Bail Date: Mon, 4 Nov 2013 12:47:34 +0900 Subject: [PATCH] edje: update use of eina_cow_free to latest change. --- src/lib/edje/edje_calc.c | 16 ++++++++-------- src/lib/edje/edje_load.c | 12 ++++++------ src/lib/edje/edje_program.c | 12 ++++++------ 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c index 71eb95d..4f02f78 100644 --- a/src/lib/edje/edje_calc.c +++ b/src/lib/edje/edje_calc.c @@ -574,9 +574,9 @@ _edje_part_description_apply(Edje *ed, Edje_Real_Part *ep, const char *d1, doubl if (ep->param2) { free(ep->param2->set); - eina_cow_free(_edje_calc_params_map_cow, ep->param2->p.map); + eina_cow_free(_edje_calc_params_map_cow, (const Eina_Cow_Data **) &ep->param2->p.map); #ifdef HAVE_EPHYSICS - eina_cow_free(_edje_calc_params_physics_cow, ep->param2->p.physics); + eina_cow_free(_edje_calc_params_physics_cow, (const Eina_Cow_Data **) &ep->param2->p.physics); #endif } eina_mempool_free(_edje_real_part_state_mp, ep->param2); @@ -3643,9 +3643,9 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta } #ifndef EDJE_CALC_CACHE - eina_cow_free(_edje_calc_params_map_cow, lp2.map); + eina_cow_free(_edje_calc_params_map_cow, (const Eina_Cow_Data **) &lp2.map); #ifdef HAVE_EPHYSICS - eina_cow_free(_edje_calc_params_physics_cow, lp2.physics); + eina_cow_free(_edje_calc_params_physics_cow, (const Eina_Cow_Data **) &lp2.physics); #endif #endif pf = p3; @@ -3963,10 +3963,10 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta if (pf == &lp3) { - eina_cow_free(_edje_calc_params_map_cow, lp3.map); + eina_cow_free(_edje_calc_params_map_cow, (const Eina_Cow_Data **) &lp3.map); lp3.map = NULL; #ifdef HAVE_EPHYSICS - eina_cow_free(_edje_calc_params_physics_cow, lp3.physics); + eina_cow_free(_edje_calc_params_physics_cow, (const Eina_Cow_Data **) &lp3.physics); lp3.physics = NULL; #endif } @@ -3978,9 +3978,9 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta ep->invalidate = 0; } #else - eina_cow_free(_edje_calc_params_map_cow, lp1.map); + eina_cow_free(_edje_calc_params_map_cow, (const Eina_Cow_Data **) &lp1.map); #ifdef HAVE_EPHYSICS - eina_cow_free(_edje_calc_params_physics_cow, lp1.physics); + eina_cow_free(_edje_calc_params_physics_cow, (const Eina_Cow_Data **) &lp1.physics); #endif #endif } diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c index 546f78e..f50351e 100644 --- a/src/lib/edje/edje_load.c +++ b/src/lib/edje/edje_load.c @@ -1408,9 +1408,9 @@ _edje_file_del(Edje *ed) if (rp->param2) { free(rp->param2->set); - eina_cow_free(_edje_calc_params_map_cow, rp->param2->p.map); + eina_cow_free(_edje_calc_params_map_cow, (const Eina_Cow_Data **) &rp->param2->p.map); #ifdef HAVE_EPHYSICS - eina_cow_free(_edje_calc_params_physics_cow, rp->param2->p.physics); + eina_cow_free(_edje_calc_params_physics_cow, (const Eina_Cow_Data **) &rp->param2->p.physics); #endif } eina_mempool_free(_edje_real_part_state_mp, rp->param2); @@ -1418,17 +1418,17 @@ _edje_file_del(Edje *ed) if (rp->custom) { free(rp->custom->set); - eina_cow_free(_edje_calc_params_map_cow, rp->custom->p.map); + eina_cow_free(_edje_calc_params_map_cow, (const Eina_Cow_Data **) &rp->custom->p.map); #ifdef HAVE_EPHYSICS - eina_cow_free(_edje_calc_params_physics_cow, rp->custom->p.physics); + eina_cow_free(_edje_calc_params_physics_cow, (const Eina_Cow_Data **) &rp->custom->p.physics); #endif } eina_mempool_free(_edje_real_part_state_mp, rp->custom); _edje_unref(ed); - eina_cow_free(_edje_calc_params_map_cow, rp->param1.p.map); + eina_cow_free(_edje_calc_params_map_cow, (const Eina_Cow_Data **) &rp->param1.p.map); #ifdef HAVE_EPHYSICS - eina_cow_free(_edje_calc_params_physics_cow, rp->param1.p.physics); + eina_cow_free(_edje_calc_params_physics_cow, (const Eina_Cow_Data **) &rp->param1.p.physics); #endif eina_mempool_free(_edje_real_part_mp, rp); } diff --git a/src/lib/edje/edje_program.c b/src/lib/edje/edje_program.c index 52335b9..69acfba 100644 --- a/src/lib/edje/edje_program.c +++ b/src/lib/edje/edje_program.c @@ -446,9 +446,9 @@ _edje_program_end(Edje *ed, Edje_Running_Program *runp) if (rp->current) { - eina_cow_free(_edje_calc_params_map_cow, rp->current->map); + eina_cow_free(_edje_calc_params_map_cow, (const Eina_Cow_Data **) &rp->current->map); #ifdef HAVE_EPHYSICS - eina_cow_free(_edje_calc_params_physics_cow, rp->current->physics); + eina_cow_free(_edje_calc_params_physics_cow, (const Eina_Cow_Data **) &rp->current->physics); #endif free(rp->current); rp->current = NULL; @@ -573,9 +573,9 @@ _edje_program_run(Edje *ed, Edje_Program *pr, Eina_Bool force, const char *ssig, if (rp->current) { - eina_cow_free(_edje_calc_params_map_cow, rp->current->map); + eina_cow_free(_edje_calc_params_map_cow, (const Eina_Cow_Data **) &rp->current->map); #ifdef HAVE_EPHYSICS - eina_cow_free(_edje_calc_params_physics_cow, rp->current->physics); + eina_cow_free(_edje_calc_params_physics_cow, (const Eina_Cow_Data **) &rp->current->physics); #endif free(rp->current); } @@ -587,9 +587,9 @@ _edje_program_run(Edje *ed, Edje_Program *pr, Eina_Bool force, const char *ssig, low_mem_current: if (rp->current) { - eina_cow_free(_edje_calc_params_map_cow, rp->current->map); + eina_cow_free(_edje_calc_params_map_cow, (const Eina_Cow_Data **) &rp->current->map); #ifdef HAVE_EPHYSICS - eina_cow_free(_edje_calc_params_physics_cow, rp->current->physics); + eina_cow_free(_edje_calc_params_physics_cow, (const Eina_Cow_Data **) &rp->current->physics); #endif free(rp->current); } -- 2.7.4