planix.org/actube
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

new mavl is working now

Browse Source 
FossilOrigin-Name: 65a4eefffea57509c0d7fd573e53b15bf4a730ce297b7db182aaac796ea92448
This commit is contained in:
7u83@mail.ru
2018-03-10 23:56:41 +00:00
parent e4d65ef470
commit 4171d208d0
79 changed files with 1296 additions and 1112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cw/mavl_merge.c
View File

@ -27,17 +27,17 @@
static void mavlnode_move(mavl_t m,mavl_t t, struct mavlnode *n)
{
struct mavlnode * mn = mavl_get_node(m,mavlnode_data(n));
struct mavlnode * mn = mavl_get_node(m,mavlnode_dataptr(n));
if (mn) {
if (m->del) {
m->del(mavlnode_data(mn));
m->del(mavlnode_dataptr(mn));
}
/*mn->data=n->data;*/
mavlnode_copy_data(m,mn,n);
memcpy(mavlnode_dataptr(mn),mavlnode_dataptr(n),t->data_size);
}
else{
/*mavl_add(m,&n->data);*/
mavl_add(m,mavlnode_data(n));
mavl_add(m,mavlnode_dataptr(n),NULL);
}
free(n);