summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fs.c21
-rw-r--r--mp.c3
-rw-r--r--sh.c3
-rw-r--r--ulib.c3
4 files changed, 20 insertions, 10 deletions
diff --git a/fs.c b/fs.c
index 132fddb..91d76cc 100644
--- a/fs.c
+++ b/fs.c
@@ -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]);
}
@@ -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;
@@ -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);
}
@@ -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);
diff --git a/mp.c b/mp.c
index b18bc1a..3b67b50 100644
--- a/mp.c
+++ b/mp.c
@@ -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);
diff --git a/sh.c b/sh.c
index f4975e5..a439214 100644
--- a/sh.c
+++ b/sh.c
@@ -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;
}
diff --git a/ulib.c b/ulib.c
index 033f2ec..5c8e6f3 100644
--- a/ulib.c
+++ b/ulib.c
@@ -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;