Changeset 18b6a88 in mainline for uspace/lib/c/generic/adt/odict.c

Timestamp:

2018-04-15T09:35:04Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c1f44ca

Parents:

8ebe212

Message:

More ccheck fixes, sometimes with manual intervention.

File:

• uspace/lib/c/generic/adt/odict.c (modified) (3 diffs)

uspace/lib/c/generic/adt/odict.c

@@ -75 +75 @@
         printf("[%p/%c", cur, cur->color == odc_red ? 'r' : 'b');
         if (cur->a != NULL || cur->b != NULL) {
-                putchar(' ' );
+                putchar(' ');
                 odict_print_tree(cur->a);
                 putchar(',');
@@ -254 +254 @@
                         if (cur->a == NULL) {
                                 odict_link_child_a(odlink, cur);
-                                break;
+                                break;
                         }
                         cur = cur->a;
@@ -923 +923 @@
                 b->b->up = a;
 
-        /* Swap links going out of A and out of B */
-        n = a->up; a->up = b->up; b->up = n;
-        n = a->a; a->a = b->a; b->a = n;
-        n = a->b; a->b = b->b; b->b = n;
-        c = a->color; a->color = b->color; b->color = c;
+        /*
+         * Swap links going out of A and out of B
+         */
+        n = a->up;
+        a->up = b->up;
+        b->up = n;
+
+        n = a->a;
+        a->a = b->a;
+        b->a = n;
+
+        n = a->b;
+        a->b = b->b;
+        b->b = n;
+
+        c = a->color;
+        a->color = b->color;
+        b->color = c;
 
         /* When A and B are adjacent, fix self-loops that might have arisen */