Changeset 18b6a88 in mainline for uspace/lib/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.

Location:

uspace/lib/c

Files:

• arch/mips32/include/libarch/tls.h (modified) (1 diff)
• arch/sparc64/include/libarch/syscall.h (modified) (1 diff)
• generic/adt/odict.c (modified) (3 diffs)
• generic/fibril_synch.c (modified) (1 diff)
• include/assert.h (modified) (2 diffs)

uspace/lib/c/arch/mips32/include/libarch/tls.h

@@ -69 +69 @@
         tp += MIPS_TP_OFFSET + sizeof(tcb_t);
 
-        asm volatile ("add $27, %0, $0" : : "r"(tp)); /* Move tls to K1 */
+        asm volatile ("add $27, %0, $0" : : "r" (tp)); /* Move tls to K1 */
 }
 
-static inline tcb_t * __tcb_get(void)
+static inline tcb_t *__tcb_get(void)
 {
-        void * retval;
+        void *retval;
 
-        asm volatile("add %0, $27, $0" : "=r"(retval));
+        asm volatile ("add %0, $27, $0" : "=r" (retval));
 
         return (tcb_t *)(retval - MIPS_TP_OFFSET - sizeof(tcb_t));

uspace/lib/c/arch/sparc64/include/libarch/syscall.h

@@ -60 +60 @@
 
         asm volatile (
-                "ta %7\n"
-                : "=r" (a1)
-                : "r" (a1), "r" (a2), "r" (a3), "r" (a4), "r" (a5), "r" (a6),
-                  "i" (id)
-                : "memory"
+            "ta %7\n"
+            : "=r" (a1)
+            : "r" (a1), "r" (a2), "r" (a3), "r" (a4), "r" (a5), "r" (a6),
+              "i" (id)
+            : "memory"
         );
 

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 */

uspace/lib/c/generic/fibril_synch.c

@@ -354 +354 @@
 
 errno_t
-    fibril_condvar_wait_timeout(fibril_condvar_t *fcv, fibril_mutex_t *fm,
+fibril_condvar_wait_timeout(fibril_condvar_t *fcv, fibril_mutex_t *fm,
     suseconds_t timeout)
 {

uspace/lib/c/include/assert.h

@@ -64 +64 @@
 
 #ifndef NDEBUG
-        #define assert(expr) ((expr) ? (void) 0 : __helenos_assert_abort(#expr, __FILE__, __LINE__))
+#define assert(expr) ((expr) ? (void) 0 : __helenos_assert_abort(#expr, __FILE__, __LINE__))
 #else
-        #define assert(expr) ((void) 0)
+#define assert(expr) ((void) 0)
 #endif
 
@@ -74 +74 @@
 
 #ifndef NDEBUG
-        #define safe_assert(expr) ((expr) ? (void) 0 : __helenos_assert_quick_abort(#expr, __FILE__, __LINE__))
+#define safe_assert(expr) ((expr) ? (void) 0 : __helenos_assert_quick_abort(#expr, __FILE__, __LINE__))
 #else
-        #define safe_assert(expr) ((void) 0)
+#define safe_assert(expr) ((void) 0)
 #endif