12 files changed, 23 insertions, 24 deletions

diff --git a/console.c b/console.c
index 8acc242..22b4b23 100644
--- a/console.c
+++ b/console.c
@@ -51,7 +51,7 @@ cga_putc(int c)
   else if(c == BACKSPACE){
     if(pos > 0)
       crt[--pos] = ' ' | 0x0700;
-  }else
+  } else
     crt[pos++] = (c&0xff) | 0x0700;  // black on white
   
   if((pos/80) >= 24){  // Scroll up.
@@ -91,7 +91,7 @@ printint(int xx, int base, int sgn)
   if(sgn && xx < 0){
     neg = 1;
     x = 0 - xx;
-  }else{
+  } else {
     x = xx;
   }
 
diff --git a/fs.c b/fs.c
index 3521881..f0ae0c5 100644
--- a/fs.c
+++ b/fs.c
@@ -358,7 +358,6 @@ bmap(struct inode *ip, uint bn, int alloc)
   panic("bmap: out of range");
 }
 
-// PAGEBREAK: 30
 // Truncate inode (discard contents).
 static void
 itrunc(struct inode *ip)
@@ -565,7 +564,7 @@ skipelem(char *path, char *name)
   len = path - s;
   if(len >= DIRSIZ)
     memmove(name, s, DIRSIZ);
-  else{
+  else {
     memmove(name, s, len);
     name[len] = 0;
   }
diff --git a/ide.c b/ide.c
index 53139ec..78c3123 100644
--- a/ide.c
+++ b/ide.c
@@ -81,7 +81,7 @@ ide_start_request(struct buf *b)
   if(b->flags & B_DIRTY){
     outb(0x1f7, IDE_CMD_WRITE);
     outsl(0x1f0, b->data, 512/4);
-  }else{
+  } else {
     outb(0x1f7, IDE_CMD_READ);
   }
 }
diff --git a/kbd.c b/kbd.c
index 6f5970f..a4a4a4e 100644
--- a/kbd.c
+++ b/kbd.c
@@ -20,12 +20,12 @@ kbd_getc(void)
   if(data == 0xE0){
     shift |= E0ESC;
     return 0;
-  }else if(data & 0x80){
+  } else if(data & 0x80){
     // Key released
     data = (shift & E0ESC ? data : data & 0x7F);
     shift &= ~(shiftcode[data] | E0ESC);
     return 0;
-  }else if(shift & E0ESC){
+  } else if(shift & E0ESC){
     // Last character was an E0 escape; or with 0x80
     data |= 0x80;
     shift &= ~E0ESC;
diff --git a/mp.c b/mp.c
index 5298ccc..cc2ab06 100644
--- a/mp.c
+++ b/mp.c
@@ -60,7 +60,7 @@ mp_search(void)
   if((p = (bda[0x0F]<<8)|bda[0x0E])){
     if((mp = mp_search1((uchar*)p, 1024)))
       return mp;
-  }else{
+  } else {
     p = ((bda[0x14]<<8)|bda[0x13])*1024;
     if((mp = mp_search1((uchar*)p-1024, 1024)))
       return mp;
diff --git a/pipe.c b/pipe.c
index c2c9d75..43f623a 100644
--- a/pipe.c
+++ b/pipe.c
@@ -65,7 +65,7 @@ pipeclose(struct pipe *p, int writable)
   if(writable){
     p->writeopen = 0;
     wakeup(&p->readp);
-  }else{
+  } else {
     p->readopen = 0;
     wakeup(&p->writep);
   }
diff --git a/printf.c b/printf.c
index a5c660a..9972b45 100644
--- a/printf.c
+++ b/printf.c
@@ -20,7 +20,7 @@ printint(int fd, int xx, int base, int sgn)
   if(sgn && xx < 0){
     neg = 1;
     x = -xx;
-  }else{
+  } else {
     x = xx;
   }
 
@@ -50,17 +50,17 @@ printf(int fd, char *fmt, ...)
     if(state == 0){
       if(c == '%'){
         state = '%';
-      }else{
+      } else {
         putc(fd, c);
       }
-    }else if(state == '%'){
+    } else if(state == '%'){
       if(c == 'd'){
         printint(fd, *ap, 10, 1);
         ap++;
-      }else if(c == 'x' || c == 'p'){
+      } else if(c == 'x' || c == 'p'){
         printint(fd, *ap, 16, 0);
         ap++;
-      }else if(c == 's'){
+      } else if(c == 's'){
         s = (char*)*ap;
         ap++;
         if(s == 0)
@@ -69,12 +69,12 @@ printf(int fd, char *fmt, ...)
           putc(fd, *s);
           s++;
         }
-      }else if(c == 'c'){
+      } else if(c == 'c'){
         putc(fd, *ap);
         ap++;
-      }else if(c == '%'){
+      } else if(c == '%'){
         putc(fd, c);
-      }else{
+      } else {
         // Unknown % sequence.  Print it to draw attention.
         putc(fd, '%');
         putc(fd, c);
diff --git a/proc.c b/proc.c
index 2bd4215..a6d189b 100644
--- a/proc.c
+++ b/proc.c
@@ -86,7 +86,7 @@ setupsegs(struct proc *p)
   if(p){
     c->gdt[SEG_UCODE] = SEG(STA_X|STA_R, (uint)p->mem, p->sz-1, DPL_USER);
     c->gdt[SEG_UDATA] = SEG(STA_W, (uint)p->mem, p->sz-1, DPL_USER);
-  }else{
+  } else {
     c->gdt[SEG_UCODE] = SEG_NULL;
     c->gdt[SEG_UDATA] = SEG_NULL;
   }
diff --git a/string.c b/string.c
index 0cab242..c6b6de6 100644
--- a/string.c
+++ b/string.c
@@ -41,7 +41,7 @@ memmove(void *dst, const void *src, uint n)
     d += n;
     while(n-- > 0)
       *--d = *--s;
-  }else
+  } else
     while(n-- > 0)
       *d++ = *s++;
 
diff --git a/syscall.c b/syscall.c
index bd0ed02..2a037d1 100644
--- a/syscall.c
+++ b/syscall.c
@@ -128,7 +128,7 @@ syscall(void)
   num = cp->tf->eax;
   if(num >= 0 && num < NELEM(syscalls) && syscalls[num])
     cp->tf->eax = syscalls[num]();
-  else{
+  else {
     cprintf("%d %s: unknown sys call %d\n",
             cp->pid, cp->name, num);
     cp->tf->eax = -1;
diff --git a/sysfile.c b/sysfile.c
index 400d395..279847b 100644
--- a/sysfile.c
+++ b/sysfile.c
@@ -270,7 +270,7 @@ sys_open(void)
   if(omode & O_CREATE){
     if((ip = create(path, 1, T_FILE, 0, 0)) == 0)
       return -1;
-  }else{
+  } else {
     if((ip = namei(path)) == 0)
       return -1;
     ilock(ip);
diff --git a/umalloc.c b/umalloc.c
index ca31aa7..afc86a5 100644
--- a/umalloc.c
+++ b/umalloc.c
@@ -33,12 +33,12 @@ free(void *ap)
   if(bp + bp->s.size == p->s.ptr){
     bp->s.size += p->s.ptr->s.size;
     bp->s.ptr = p->s.ptr->s.ptr;
-  }else
+  } else
     bp->s.ptr = p->s.ptr;
   if(p + p->s.size == bp){
     p->s.size += bp->s.size;
     p->s.ptr = bp->s.ptr;
-  }else
+  } else
     p->s.ptr = bp;
   freep = p;
 }
@@ -75,7 +75,7 @@ malloc(uint nbytes)
     if(p->s.size >= nunits){
       if(p->s.size == nunits)
         prevp->s.ptr = p->s.ptr;
-      else{
+      else {
         p->s.size -= nunits;
         p += p->s.size;
         p->s.size = nunits;