diff options
author | rsc <rsc> | 2007-08-28 18:37:41 +0000 |
---|---|---|
committer | rsc <rsc> | 2007-08-28 18:37:41 +0000 |
commit | 5516be1fed10ac87848668964c495266d02ae915 (patch) | |
tree | b3f85375a1ccd347861e9eea34d644cc9824c444 | |
parent | e4d6a21165c01dd743a68e323fb06708ef820ab7 (diff) | |
download | xv6-labs-5516be1fed10ac87848668964c495266d02ae915.tar.gz xv6-labs-5516be1fed10ac87848668964c495266d02ae915.tar.bz2 xv6-labs-5516be1fed10ac87848668964c495266d02ae915.zip |
spaces around else for rtm
-rw-r--r-- | console.c | 4 | ||||
-rw-r--r-- | fs.c | 3 | ||||
-rw-r--r-- | ide.c | 2 | ||||
-rw-r--r-- | kbd.c | 4 | ||||
-rw-r--r-- | mp.c | 2 | ||||
-rw-r--r-- | pipe.c | 2 | ||||
-rw-r--r-- | printf.c | 16 | ||||
-rw-r--r-- | proc.c | 2 | ||||
-rw-r--r-- | string.c | 2 | ||||
-rw-r--r-- | syscall.c | 2 | ||||
-rw-r--r-- | sysfile.c | 2 | ||||
-rw-r--r-- | umalloc.c | 6 |
12 files changed, 23 insertions, 24 deletions
@@ -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; } @@ -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; } @@ -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); } } @@ -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; @@ -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; @@ -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); } @@ -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); @@ -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; } @@ -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++; @@ -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; @@ -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); @@ -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; |