Changeset 5a95b25 in mainline for generic

Timestamp:

2005-12-13T11:23:14Z (20 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

91ef0d95

Parents:

5bb8e45

Message:

Cleanups to make it compile with -Wall. Did not catch everything yet.

Location:

generic

Files:

• include/func.h (modified) (1 diff)
• include/panic.h (modified) (1 diff)
• src/debug/print.c (modified) (2 diffs)
• src/lib/func.c (modified) (1 diff)
• src/main/kinit.c (modified) (3 diffs)
• src/mm/frame.c (modified) (1 diff)
• src/mm/heap.c (modified) (1 diff)
• src/synch/waitq.c (modified) (1 diff)
• src/time/clock.c (modified) (1 diff)

generic/include/func.h

@@ -33 +33 @@
 #include <typedefs.h>
 
-extern __u32 haltstate;
+extern volatile __u32 haltstate;
 
 extern void halt(void);

generic/include/panic.h

@@ -36 +36 @@
 #endif
 
-extern void panic_printf(char *fmt, ...);
+extern void panic_printf(char *fmt, ...) __attribute__((noreturn)) ;
 
 #endif

generic/src/debug/print.c

@@ -56 +56 @@
         char c;
         
-        while (c = str[i++])
+        while ((c = str[i++]))
                 putchar(c);
 }
@@ -291 +291 @@
         spinlock_lock(&printflock);
 
-        while (c = fmt[i++]) {
+        while ((c = fmt[i++])) {
                 switch (c) {
 

generic/src/lib/func.c

@@ -35 +35 @@
 #include <console/kconsole.h>
 
-__u32   haltstate = 0; /**< Halt flag */
+__u32 volatile haltstate = 0; /**< Halt flag */
 
 

generic/src/main/kinit.c

@@ -85 +85 @@
                  * Just a beautification.
                  */
-                if (t = thread_create(kmp, NULL, TASK, 0)) {
+                if ((t = thread_create(kmp, NULL, TASK, 0))) {
                         spinlock_lock(&t->lock);
                         t->flags |= X_WIRED;
@@ -113 +113 @@
                 for (i = 0; i < config.cpu_count; i++) {
 
-                        if (t = thread_create(kcpulb, NULL, TASK, 0)) {
+                        if ((t = thread_create(kcpulb, NULL, TASK, 0))) {
                                 spinlock_lock(&t->lock);                        
                                 t->flags |= X_WIRED;
@@ -134 +134 @@
          * Create kernel console.
          */
-        if (t = thread_create(kconsole, "kconsole", TASK, 0))
+        if ((t = thread_create(kconsole, "kconsole", TASK, 0)))
                 thread_ready(t);
         else panic("thread_create/kconsole\n");

generic/src/mm/frame.c

@@ -410 +410 @@
         if (is_left) {
                 index = (FRAME_INDEX(zone, frame)) + (1 << frame->buddy_order);
-        } else if (is_right) {
+        } else { // if (is_right)
                 index = (FRAME_INDEX(zone, frame)) - (1 << frame->buddy_order);
         }

generic/src/mm/heap.c

@@ -101 +101 @@
                 y->next = NULL;
                 
-                if (z = x->next) {
+                z = x->next;
+                if (z) {
                         z->prev = y;
                         y->next = z;

generic/src/synch/waitq.c

@@ -77 +77 @@
 grab_locks:
         spinlock_lock(&t->lock);
-        if (wq = t->sleep_queue) {              /* assignment */
+        if ((wq = t->sleep_queue)) {            /* assignment */
                 if (!spinlock_trylock(&wq->lock)) {
                         spinlock_unlock(&t->lock);

generic/src/time/clock.c

@@ -93 +93 @@
         
                 spinlock_lock(&THREAD->lock);
-                if (ticks = THREAD->ticks)
+                if ((ticks = THREAD->ticks))
                         THREAD->ticks--;
                 spinlock_unlock(&THREAD->lock);