public/libtdata
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code style compliance;

Browse Source
This commit is contained in:
Alexander Vdolainen 2019-05-21 22:33:49 +03:00
parent 5a60edd6ef
commit 70072351a2
1 changed files with 194 additions and 191 deletions

17
lib/redblack.c

@ -88,7 +88,7 @@ static void redblack_insert(usrtc_t *us, usrtc_node_t *node, const void *key)
usrtc_tree_rotate_right(parent, grandpa); usrtc_tree_rotate_right(parent, grandpa);
break; break;
} }
} else { /*ooh,parent == parent->parent->right*/ } else { /* parent == parent->parent->right */
usrtc_node_t *uncle = grandpa->left; usrtc_node_t *uncle = grandpa->left;
if(uncle->color == usrtc_red) { if(uncle->color == usrtc_red) {
parent->color = usrtc_black; parent->color = usrtc_black;
@ -151,7 +151,8 @@ static void redblack_delete(usrtc_t *us,usrtc_node_t *node)
if(sister == tree_null_priv(us)) if(sister == tree_null_priv(us))
return; return;
} }
if(sister->left->color==usrtc_black && sister->right->color==usrtc_black) { if((sister->left->color == usrtc_black) &&
(sister->right->color == usrtc_black)) {
sister->color = usrtc_red; sister->color = usrtc_red;
child = parent; child = parent;
} else { } else {
@ -191,7 +192,8 @@ static void redblack_delete(usrtc_t *us,usrtc_node_t *node)
if(sister == tree_null_priv(us)) if(sister == tree_null_priv(us))
return; return;
} }
if(sister->right->color==usrtc_black && sister->left->color==usrtc_black) { if((sister->right->color == usrtc_black) &&
(sister->left->color == usrtc_black)) {
sister->color = usrtc_red; sister->color = usrtc_red;
child = parent; child = parent;
} else { } else {
@ -219,7 +221,7 @@ static void redblack_delete(usrtc_t *us,usrtc_node_t *node)
child->color = usrtc_black; child->color = usrtc_black;
tree_root_priv(us)->color = usrtc_black; tree_root_priv(us)->color = usrtc_black;
} }
return;
} }
static void redblack_convert_from_list(usrtc_t *us) static void redblack_convert_from_list(usrtc_t *us)
@ -236,10 +238,10 @@ static void redblack_convert_from_list(usrtc_t *us)
unsigned int level = 0; unsigned int level = 0;
unsigned int i; unsigned int i;
if(usrtc_red!=0 && usrtc_black!=1) if((usrtc_red!=0) && (usrtc_black != 1))
return; return;
while(fullcount>=nodecount && fullcount) /*calc*/ while((fullcount >= nodecount) && fullcount) /*calc*/
fullcount >>= 1; fullcount >>= 1;
botrowcount = nodecount-fullcount; botrowcount = nodecount-fullcount;
@ -247,7 +249,7 @@ static void redblack_convert_from_list(usrtc_t *us)
for(curr = nil->next; curr!=nil; curr=next) { for(curr = nil->next; curr!=nil; curr=next) {
next=curr->next; next=curr->next;
if(complete==NULL && botrowcount--==0) { if((complete == NULL) && (botrowcount-- == 0)) {
baselevel = level = 1; baselevel = level = 1;
complete = tree[0]; complete = tree[0];
@ -305,5 +307,6 @@ static void redblack_convert_from_list(usrtc_t *us)
complete->parent = nil; complete->parent = nil;
complete->color = usrtc_black; complete->color = usrtc_black;
return;
} }