Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-28 07:03:00 +08:00
Code Issues Projects Releases Wiki Activity

rename lv_ll_rem to lv_ll_remove

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2019-11-15 11:04:46 +01:00
parent b54b5fcc2b
commit 2be039e917
9 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lv_core/lv_group.c
View File

@ -105,7 +105,7 @@ void lv_group_del(lv_group_t * group)
}
lv_ll_clear(&(group->obj_ll));
lv_ll_rem(&LV_GC_ROOT(_lv_group_ll), group);
lv_ll_remove(&LV_GC_ROOT(_lv_group_ll), group);
lv_mem_free(group);
}
@ -184,7 +184,7 @@ void lv_group_remove_obj(lv_obj_t * obj)
LV_LL_READ(g->obj_ll, i)
{
if(*i == obj) {
lv_ll_rem(&g->obj_ll, i);
lv_ll_remove(&g->obj_ll, i);
lv_mem_free(i);
obj->group_p = NULL;
break;

6
src/lv_core/lv_obj.c
View File

@ -461,9 +461,9 @@ lv_res_t lv_obj_del(lv_obj_t * obj)
lv_obj_t * par = lv_obj_get_parent(obj);
if(par == NULL) { /*It is a screen*/
lv_disp_t * d = lv_obj_get_disp(obj);
lv_ll_rem(&d->scr_ll, obj);
lv_ll_remove(&d->scr_ll, obj);
} else {
lv_ll_rem(&(par->child_ll), obj);
lv_ll_remove(&(par->child_ll), obj);
}
/*Delete the base objects*/
@ -2608,7 +2608,7 @@ static void delete_children(lv_obj_t * obj)
/*Remove the object from parent's children list*/
lv_obj_t * par = lv_obj_get_parent(obj);
lv_ll_rem(&(par->child_ll), obj);
lv_ll_remove(&(par->child_ll), obj);
/*Delete the base objects*/
if(obj->ext_attr != NULL) lv_mem_free(obj->ext_attr);

2
src/lv_draw/lv_img_decoder.c
View File

@ -214,7 +214,7 @@ lv_img_decoder_t * lv_img_decoder_create(void)
*/
void lv_img_decoder_delete(lv_img_decoder_t * decoder)
{
lv_ll_rem(&LV_GC_ROOT(_lv_img_defoder_ll), decoder);
lv_ll_remove(&LV_GC_ROOT(_lv_img_defoder_ll), decoder);
lv_mem_free(decoder);
}

2
src/lv_hal/lv_hal_disp.c
View File

@ -191,7 +191,7 @@ void lv_disp_remove(lv_disp_t * disp)
indev = lv_indev_get_next(indev);
}
lv_ll_rem(&LV_GC_ROOT(_lv_disp_ll), disp);
lv_ll_remove(&LV_GC_ROOT(_lv_disp_ll), disp);
lv_mem_free(disp);
if(was_default) lv_disp_set_default(lv_ll_get_head(&LV_GC_ROOT(_lv_disp_ll)));

4
src/lv_misc/lv_anim.c
View File

@ -125,7 +125,7 @@ bool lv_anim_del(void * var, lv_anim_exec_xcb_t exec_cb)
a_next = lv_ll_get_next(&LV_GC_ROOT(_lv_anim_ll), a);
if(a->var == var && (a->exec_cb == exec_cb || exec_cb == NULL)) {
lv_ll_rem(&LV_GC_ROOT(_lv_anim_ll), a);
lv_ll_remove(&LV_GC_ROOT(_lv_anim_ll), a);
lv_mem_free(a);
anim_list_changed = true; /*Read by `anim_task`. It need to know if a delete occurred in
the linked list*/
@ -444,7 +444,7 @@ static bool anim_ready_handler(lv_anim_t * a)
* This way the `ready_cb` will see the animations like it's animation is ready deleted*/
lv_anim_t a_tmp;
memcpy(&a_tmp, a, sizeof(lv_anim_t));
lv_ll_rem(&LV_GC_ROOT(_lv_anim_ll), a);
lv_ll_remove(&LV_GC_ROOT(_lv_anim_ll), a);
lv_mem_free(a);
anim_list_changed = true;

8
src/lv_misc/lv_ll.c
View File

@ -160,7 +160,7 @@ void * lv_ll_ins_tail(lv_ll_t * ll_p)
* @param ll_p pointer to the linked list of 'node_p'
* @param node_p pointer to node in 'll_p' linked list
*/
void lv_ll_rem(lv_ll_t * ll_p, void * node_p)
void lv_ll_remove(lv_ll_t * ll_p, void * node_p)
{
if(lv_ll_get_head(ll_p) == node_p) {
/*The new head will be the node after 'n_act'*/
@ -202,7 +202,7 @@ void lv_ll_clear(lv_ll_t * ll_p)
while(i != NULL) {
i_next = lv_ll_get_next(ll_p, i);
lv_ll_rem(ll_p, i);
lv_ll_remove(ll_p, i);
lv_mem_free(i);
i = i_next;
@ -219,7 +219,7 @@ void lv_ll_clear(lv_ll_t * ll_p)
*/
void lv_ll_chg_list(lv_ll_t * ll_ori_p, lv_ll_t * ll_new_p, void * node, bool head)
{
lv_ll_rem(ll_ori_p, node);
lv_ll_remove(ll_ori_p, node);
if(head) {
/*Set node as head*/
@ -362,7 +362,7 @@ void lv_ll_move_before(lv_ll_t * ll_p, void * n_act, void * n_after)
if(n_act == n_before) return; /*Already before `n_after`*/
/*It's much easier to remove from the list and add again*/
lv_ll_rem(ll_p, n_act);
lv_ll_remove(ll_p, n_act);
/*Add again by setting the prev. and next nodes*/
node_set_next(ll_p, n_before, n_act);

2
src/lv_misc/lv_ll.h
View File

@ -76,7 +76,7 @@ void * lv_ll_ins_tail(lv_ll_t * ll_p);
* @param ll_p pointer to the linked list of 'node_p'
* @param node_p pointer to node in 'll_p' linked list
*/
void lv_ll_rem(lv_ll_t * ll_p, void * node_p);
void lv_ll_remove(lv_ll_t * ll_p, void * node_p);
/**
* Remove and free all elements from a linked list. The list remain valid but become empty.

2
src/lv_misc/lv_task.c
View File

@ -253,7 +253,7 @@ void lv_task_set_cb(lv_task_t * task, lv_task_cb_t task_cb)
*/
void lv_task_del(lv_task_t * task)
{
lv_ll_rem(&LV_GC_ROOT(_lv_task_ll), task);
lv_ll_remove(&LV_GC_ROOT(_lv_task_ll), task);
lv_mem_free(task);

2
src/lv_objx/lv_chart.c
View File

@ -191,7 +191,7 @@ lv_chart_series_t * lv_chart_add_series(lv_obj_t * chart, lv_color_t color)
ser->points = lv_mem_alloc(sizeof(lv_coord_t) * ext->point_cnt);
LV_ASSERT_MEM(ser->points);
if(ser->points == NULL) {
lv_ll_rem(&ext->series_ll, ser);
lv_ll_remove(&ext->series_ll, ser);
lv_mem_free(ser);
return NULL;
}