diff options
author | rsc <rsc> | 2007-08-28 18:32:08 +0000 |
---|---|---|
committer | rsc <rsc> | 2007-08-28 18:32:08 +0000 |
commit | e4d6a21165c01dd743a68e323fb06708ef820ab7 (patch) | |
tree | 3088155cccccdfbed6348199021907587cee15b3 /umalloc.c | |
parent | c1b100e93044469de30c634107bc645361cc1a73 (diff) | |
download | xv6-labs-e4d6a21165c01dd743a68e323fb06708ef820ab7.tar.gz xv6-labs-e4d6a21165c01dd743a68e323fb06708ef820ab7.tar.bz2 xv6-labs-e4d6a21165c01dd743a68e323fb06708ef820ab7.zip |
more consistent spacing
Diffstat (limited to 'umalloc.c')
-rw-r--r-- | umalloc.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -30,15 +30,15 @@ free(void *ap) for(p = freep; !(bp > p && bp < p->s.ptr); p = p->s.ptr) if(p >= p->s.ptr && (bp > p || bp < p->s.ptr)) break; - if(bp + bp->s.size == p->s.ptr) { + 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) { + 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; } @@ -67,15 +67,15 @@ malloc(uint nbytes) uint nunits; nunits = (nbytes + sizeof(Header) - 1)/sizeof(Header) + 1; - if((prevp = freep) == 0) { + if((prevp = freep) == 0){ base.s.ptr = freep = prevp = &base; base.s.size = 0; } - for(p = prevp->s.ptr; ; prevp = p, p = p->s.ptr) { - if(p->s.size >= nunits) { + for(p = prevp->s.ptr; ; prevp = p, p = p->s.ptr){ + 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; |