Skip to content

Commit

Permalink
break single-line if statements
Browse files Browse the repository at this point in the history
  • Loading branch information
rsc committed Sep 6, 2006
1 parent 96d467b commit 48b8247
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 10 deletions.
21 changes: 14 additions & 7 deletions fs.c
Original file line number Diff line number Diff line change
Expand Up @@ -371,20 +371,23 @@ newblock(struct inode *ip, uint lbn)
if(lbn < NDIRECT) {
if(ip->addrs[lbn] == 0) {
b = balloc(ip->dev);
if(b <= 0) return -1;
if(b <= 0)
return -1;
ip->addrs[lbn] = b;
}
} else {
if(ip->addrs[INDIRECT] == 0) {
b = balloc(ip->dev);
if(b <= 0) return -1;
if(b <= 0)
return -1;
ip->addrs[INDIRECT] = b;
}
inbp = bread(ip->dev, ip->addrs[INDIRECT]);
inaddrs = (uint*) inbp->data;
if(inaddrs[lbn - NDIRECT] == 0) {
b = balloc(ip->dev);
if(b <= 0) return -1;
if(b <= 0)
return -1;
inaddrs[lbn - NDIRECT] = b;
bwrite(inbp, ip->addrs[INDIRECT]);
}
Expand All @@ -407,7 +410,8 @@ writei(struct inode *ip, char *addr, uint off, uint n)
int lbn;
while(r < n) {
lbn = off / BSIZE;
if(lbn >= MAXFILE) return r;
if(lbn >= MAXFILE)
return r;
if(newblock(ip, lbn) < 0) {
cprintf("newblock failed\n");
return r;
Expand All @@ -422,8 +426,10 @@ writei(struct inode *ip, char *addr, uint off, uint n)
}
if(r > 0) {
if(off > ip->size) {
if(ip->type == T_DIR) ip->size = ((off / BSIZE) + 1) * BSIZE;
else ip->size = off;
if(ip->type == T_DIR)
ip->size = ((off / BSIZE) + 1) * BSIZE;
else
ip->size = off;
}
iupdate(ip);
}
Expand Down Expand Up @@ -462,7 +468,8 @@ namei(char *path, int mode, uint *ret_off, char **ret_last, struct inode **ret_i
if(ret_ip)
*ret_ip = 0;

if(*cp == '/') dp = iget(rootdev, 1);
if(*cp == '/')
dp = iget(rootdev, 1);
else {
dp = p->cwd;
iincref(dp);
Expand Down
3 changes: 2 additions & 1 deletion mp.c
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,8 @@ mp_startthem(void)
(uint) _binary_bootother_size);

for(c = 0; c < ncpu; c++){
if(c == cpu()) continue;
if(c == cpu())
continue;
*(uint*)(APBOOTCODE-4) = (uint) (cpus[c].mpstack) + MPSTACK; // tell it what to use for %esp
*(uint*)(APBOOTCODE-8) = (uint)mpmain; // tell it where to jump to
lapic_startap(cpus[c].apicid, (uint) APBOOTCODE);
Expand Down
3 changes: 2 additions & 1 deletion sh.c
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,8 @@ runcmd(void)
}

if(strcmp(cmdlist[c].argv[0], "/cd") == 0) {
if(debug) printf (2, "/cd %s is build in\n", cmdlist[c].argv[1]);
if(debug)
printf (2, "/cd %s is build in\n", cmdlist[c].argv[1]);
chdir(cmdlist[c].argv[1]);
return;
}
Expand Down
3 changes: 2 additions & 1 deletion ulib.c
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ stat(char *n, struct stat *st)
int r;

fd = open(n, O_RDONLY);
if(fd < 0) return -1;
if(fd < 0)
return -1;
r = fstat(fd, st);
close(fd);
return r;
Expand Down

0 comments on commit 48b8247

Please sign in to comment.