Changeset 1b20da0 in mainline for kernel/generic/src/adt/avl.c

Timestamp:

2018-02-28T17:52:03Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

3061bc1

Parents:

df6ded8

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:26:03)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:52:03)

Message:

style: Remove trailing whitespace on non-empty lines, in certain file types.

Command used: tools/srepl '\([^[:space:]]\)\s\+$' '\1' -- *.c *.h *.py *.sh *.s *.S *.ag

File:

• kernel/generic/src/adt/avl.c (modified) (22 diffs)

kernel/generic/src/adt/avl.c

@@ -76 +76 @@
                 else if (p->key < key)
                         p = p->rgt;
-                else 
+                else
                         return p;
         }
@@ -102 +102 @@
          * Iteratively descend to the leftmost leaf in the tree.
          */
-        while (p->lft != NULL) 
+        while (p->lft != NULL)
                 p = p->lft;
         
@@ -156 +156 @@
  * @param t AVL tree.
  * @param newnode New node to be inserted.
- */ 
+ */
 void avltree_insert(avltree_t *t, avltree_node_t *newnode)
-{       
-        avltree_node_t *par; 
+{
+        avltree_node_t *par;
         avltree_node_t *gpa;
         avltree_node_t *top;
@@ -170 +170 @@
         /*
          * Creating absolute key.
-         */     
+         */
         key = newnode->key + t->base;
         
@@ -223 +223 @@
         if (top->par == NULL) {
                 dpc = &t->root;
-        } else { 
+        } else {
                 if (top->par->lft == top)
                         dpc = &top->par->lft;
@@ -255 +255 @@
                          */
                         REBALANCE_INSERT_LL();
-                } else { 
+                } else {
                         /*
                          * LR rotation.
@@ -263 +263 @@
                         REBALANCE_INSERT_LR();
                 }
-        } else if (top->balance == 2) { 
+        } else if (top->balance == 2) {
                 par = top->rgt;
                 if (par->balance == 1) {
@@ -278 +278 @@
                         REBALANCE_INSERT_RL();
                 }
-        } else { 
+        } else {
                 /*
                  * Balance is not broken, insertion is finised.
@@ -303 +303 @@
  * @param ro    Read only operation; do not modify any tree pointers. This is
  *              useful for tracking direction via the dir pointer.
- * 
+ *
  * @return      Zero if w became the new root of the tree, otherwise return
  *              non-zero.
@@ -313 +313 @@
         if (u->par == NULL) {
                 if (!ro)
-                        t->root = w;    
+                        t->root = w;
                 return 0;
-        } else {        
+        } else {
                 if (u->par->lft == v) {
                         if (!ro)
@@ -362 +362 @@
  * Because multiple identical keys are allowed, the parent pointers are
  * essential during deletion.
- * 
+ *
  * @param t AVL tree structure.
  * @param node Address of the node which will be deleted.
@@ -379 +379 @@
                 if (node->rgt) {
                         /*
-                         * Replace the node with its only right son. 
+                         * Replace the node with its only right son.
                          *
                          * Balance of the right son will be repaired in the
@@ -388 +388 @@
                         gpa = cur;
                         dir = RIGHT;
-                        cur->balance = node->balance; 
+                        cur->balance = node->balance;
                 } else {
                         if (node->par == NULL) {
@@ -421 +421 @@
                          * Cutting off of the found node has two cases that
                          * depend on its left son.
-                         */ 
+                         */
                         if (cur->lft) {
                                 /*
@@ -429 +429 @@
                                 gpa->par = cur->par;
                                 dir = LEFT;
-                                gpa->balance = cur->balance; 
+                                gpa->balance = cur->balance;
                         } else {
                                 dir = RIGHT;
@@ -436 +436 @@
                         cur->par->rgt = cur->lft;
                         cur->lft = node->lft;
-                        cur->lft->par = cur; 
-                } else { 
+                        cur->lft->par = cur;
+                } else {
                         /*
                          * The left son of the node hasn't got a right son. The
@@ -443 +443 @@
                          */
                         dir = LEFT;
-                        gpa = cur; 
+                        gpa = cur;
                 }
                 if (node->rgt)
-                        node->rgt->par = cur; 
+                        node->rgt->par = cur;
                 cur->rgt = node->rgt;
                 cur->balance = node->balance;
@@ -473 +473 @@
                                  */
                                 break;
-                        } else if (gpa->balance == 2) { 
+                        } else if (gpa->balance == 2) {
                                 /*
                                  * Bad balance, heights of left and right
@@ -538 +538 @@
                                                 (void) repair(t, par, gpa, par,
                                                     NULL, false);
-                                                break; 
+                                                break;
                                         } else {
                                                 par->balance = 0;
@@ -559 +559 @@
                                 gpa = gpa->par;
                         }
-                } else { 
+                } else {
                         /*
                          * Deletion was made in the right subtree.
@@ -605 +605 @@
                                                 break;
                                         gpa = cur->par;
-                                } else { 
+                                } else {
                                         /*
                                          * LL rotation.
@@ -681 +681 @@
                 node = node->lft;
         
-        avltree_delete(t, node); 
+        avltree_delete(t, node);
 
         return true;