cwfs: remove old some assert() debugging

[plan9front.git] / sys / src / cmd / cwfs / mworm.c

diff --git a/sys/src/cmd/cwfs/mworm.c b/sys/src/cmd/cwfs/mworm.c
old mode 100755 (executable)
new mode 100644 (file)
index 407ad6a..14e9dea
--- a/sys/src/cmd/cwfs/mworm.c
+++ b/sys/src/cmd/cwfs/mworm.c
@@ -14,7 +14,7 @@ mcatinit(Device *d)
                d->cat.ndev++;
        }
 
-       list = malloc(d->cat.ndev*sizeof(Device*));
+       list = ialloc((uintptr)d->cat.ndev * sizeof(Device*), 0);
        d->private = list;
        for(x=d->cat.first; x; x=x->link) {
                *list++ = x;
@@ -57,7 +57,7 @@ mcatread(Device *d, Off b, void *c)
                        return devread(x, b-l, c);
                l += m;
        }
-       print("mcatread past end: %Z block %lld, %lld beyond end\n",
+       fprint(2, "mcatread past end: %Z block %lld, %lld beyond end\n",
                d, (Wideoff)b, (Wideoff)l);
        return 1;
 }
@@ -79,7 +79,7 @@ mcatwrite(Device *d, Off b, void *c)
                        return devwrite(x, b-l, c);
                l += m;
        }
-       print("mcatwrite past end: %Z block %lld, %lld beyond end\n",
+       fprint(2, "mcatwrite past end: %Z block %lld, %lld beyond end\n",
                d, (Wideoff)b, (Wideoff)l);
        return 1;
 }
@@ -176,7 +176,7 @@ partread(Device *d, Off b, void *c)
                size = l*100;
        if(b < size)
                return devread(d->part.d, base+b, c);
-       print("partread past end: %Z blk %lld size %lld\n",
+       fprint(2, "partread past end: %Z blk %lld size %lld\n",
                d, (Wideoff)b, (Wideoff)size);
        return 1;
 }
@@ -193,7 +193,7 @@ partwrite(Device *d, Off b, void *c)
                size = l*100;
        if(b < size)
                return devwrite(d->part.d, base+b, c);
-       print("partwrite past end: %Z blk %lld size %lld\n",
+       fprint(2, "partwrite past end: %Z blk %lld size %lld\n",
                d, (Wideoff)b, (Wideoff)size);
        return 1;
 }
@@ -239,7 +239,7 @@ mirrread(Device *d, Off b, void *c)
        Device *x;
 
        if (d->cat.first == nil) {
-               print("mirrread: empty mirror %Z\n", d);
+               fprint(2, "mirrread: empty mirror %Z\n", d);
                return 1;
        }
        for(x=d->cat.first; x; x=x->link) {
@@ -249,7 +249,7 @@ mirrread(Device *d, Off b, void *c)
                        return 0;
        }
        // DANGER WILL ROBINSON
-       print("mirrread: all mirrors of %Z block %lld are bad\n",
+       fprint(2, "mirrread: all mirrors of %Z block %lld are bad\n",
                d, (Wideoff)b);
        return 1;
 }
@@ -268,7 +268,7 @@ ewrite(Device *x, Off b, void *c)
        if(x->size == 0)
                x->size = devsize(x);
        if (devwrite(x, b, c) != 0) {
-               print("mirrwrite: error at %Z block %lld\n", x, (Wideoff)b);
+               fprint(2, "mirrwrite: error at %Z block %lld\n", x, (Wideoff)b);
                return 1;
        }
        return 0;
@@ -289,7 +289,7 @@ int
 mirrwrite(Device *d, Off b, void *c)
 {
        if (d->cat.first == nil) {
-               print("mirrwrite: empty mirror %Z\n", d);
+               fprint(2, "mirrwrite: empty mirror %Z\n", d);
                return 1;
        }
        return wrmirrs1st(d->cat.first, b, c);