diff options
author | rsc <devnull@localhost> | 2005-07-13 10:50:44 +0000 |
---|---|---|
committer | rsc <devnull@localhost> | 2005-07-13 10:50:44 +0000 |
commit | 2d70c581f4346401c61e6bb25b3e31b001f05e0a (patch) | |
tree | 88546cbd10a0ce275cd0a3c556fc358782d7cc37 /src/lib9pclient/fs.c | |
parent | 2e9749ec60f3e5c760f3bf5dcc4f956a3d28fe48 (diff) | |
download | plan9port-2d70c581f4346401c61e6bb25b3e31b001f05e0a.tar.gz plan9port-2d70c581f4346401c61e6bb25b3e31b001f05e0a.tar.bz2 plan9port-2d70c581f4346401c61e6bb25b3e31b001f05e0a.zip |
better error messages
Diffstat (limited to 'src/lib9pclient/fs.c')
-rw-r--r-- | src/lib9pclient/fs.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/lib9pclient/fs.c b/src/lib9pclient/fs.c index 1a641d12..ff03ad3f 100644 --- a/src/lib9pclient/fs.c +++ b/src/lib9pclient/fs.c @@ -31,8 +31,10 @@ fsinit(int fd) fmtinstall('M', dirmodefmt); fs = mallocz(sizeof(CFsys), 1); - if(fs == nil) + if(fs == nil){ + werrstr("mallocz: %r"); return nil; + } fs->fd = fd; fs->ref = 1; fs->mux.aux = fs; @@ -48,6 +50,8 @@ fsinit(int fd) strcpy(fs->version, "9P2000"); if((n = fsversion(fs, 8192, fs->version, sizeof fs->version)) < 0){ + werrstr("fsversion: %r"); +fprint(2, "%r\n"); _fsunmount(fs); return nil; } @@ -150,8 +154,10 @@ fsversion(CFsys *fs, int msize, char *version, int nversion) r = _fsrpc(fs, &tx, &rx, &freep); fs->mux.mintag = oldmintag; fs->mux.maxtag = oldmaxtag; - if(r < 0) + if(r < 0){ + werrstr("fsrpc: %r"); return -1; + } strecpy(version, version+nversion, rx.version); free(freep); @@ -212,19 +218,21 @@ _fsrpc(CFsys *fs, Fcall *tx, Fcall *rx, void **freep) nn = convS2M(tx, tpkt, n); if(nn != n){ free(tpkt); - werrstr("libfs: sizeS2M convS2M mismatch"); + werrstr("lib9pclient: sizeS2M convS2M mismatch"); fprint(2, "%r\n"); return -1; } rpkt = muxrpc(&fs->mux, tpkt); free(tpkt); - if(rpkt == nil) + if(rpkt == nil){ + werrstr("muxrpc: %r"); return -1; + } n = GBIT32((uchar*)rpkt); nn = convM2S(rpkt, n, rx); if(nn != n){ free(rpkt); - werrstr("libfs: convM2S packet size mismatch %d %d", n, nn); + werrstr("lib9pclient: convM2S packet size mismatch %d %d", n, nn); fprint(2, "%r\n"); return -1; } @@ -331,7 +339,7 @@ _fsrecv(Mux *mux) n = GBIT32(buf); pkt = malloc(n+4); if(pkt == nil){ - fprint(2, "libfs out of memory reading 9p packet; here comes trouble\n"); + fprint(2, "lib9pclient out of memory reading 9p packet; here comes trouble\n"); return nil; } PBIT32(pkt, n); |