Skip to content

Commit

Permalink
fixes from Peter Froehlich
Browse files Browse the repository at this point in the history
  • Loading branch information
rsc committed Feb 28, 2011
1 parent a6cd750 commit c5f5387
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions console.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,24 @@ static struct {
} cons;

static void
printint(int xx, int base, int sgn)
printint(int xx, int base, int sign)
{
static char digits[] = "0123456789abcdef";
char buf[16];
int i, neg;
int i;
uint x;

if(sgn && (neg = xx < 0)){
neg = 1;
if(sign && (sign = xx < 0))
x = -xx;
} else
else
x = xx;

i = 0;
do{
buf[i++] = digits[x % base];
}while((x /= base) != 0);
if(neg)

if(sign)
buf[i++] = '-';

while(--i >= 0)
Expand Down
2 changes: 1 addition & 1 deletion mkfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ balloc(int used)
int i;

printf("balloc: first %d blocks have been allocated\n", used);
assert(used < 512);
assert(used < 512*8);
bzero(buf, 512);
for(i = 0; i < used; i++){
buf[i/8] = buf[i/8] | (0x1 << (i%8));
Expand Down
2 changes: 1 addition & 1 deletion syscall.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ argptr(int n, char **pp, int size)

if(argint(n, &i) < 0)
return -1;
if((uint)i >= proc->sz || (uint)i+size >= proc->sz)
if((uint)i >= proc->sz || (uint)i+size > proc->sz)
return -1;
*pp = (char*)i;
return 0;
Expand Down

0 comments on commit c5f5387

Please sign in to comment.