diff options
| author | Russ Cox <rsc@swtch.com> | 2010-12-07 13:34:11 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@swtch.com> | 2010-12-07 13:34:11 -0500 |
| commit | 74dd0321756f968c595487f694fbe74ad00f0624 (patch) | |
| tree | e551d8fbc2c00f8670c0073c1d794dda19cd2ac7 /src/lib9pclient/dirread.c | |
| parent | d10a7ed9a899c17d142021298dd45b4ea9ae6b84 (diff) | |
| download | plan9port-74dd0321756f968c595487f694fbe74ad00f0624.tar.gz plan9port-74dd0321756f968c595487f694fbe74ad00f0624.tar.bz2 plan9port-74dd0321756f968c595487f694fbe74ad00f0624.zip | |
delete 9P2000.u
thanks to Erik Quanstrom
R=rsc
http://codereview.appspot.com/3469042
Diffstat (limited to 'src/lib9pclient/dirread.c')
| -rw-r--r-- | src/lib9pclient/dirread.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib9pclient/dirread.c b/src/lib9pclient/dirread.c index c2b13882..32c59783 100644 --- a/src/lib9pclient/dirread.c +++ b/src/lib9pclient/dirread.c @@ -7,7 +7,7 @@ #include "fsimpl.h" static long -dirpackage(uchar *buf, long ts, Dir **d, int dotu) +dirpackage(uchar *buf, long ts, Dir **d) { char *s; long ss, i, n, nn, m; @@ -23,7 +23,7 @@ dirpackage(uchar *buf, long ts, Dir **d, int dotu) n = 0; for(i = 0; i < ts; i += m){ m = BIT16SZ + GBIT16(&buf[i]); - if(statchecku(&buf[i], m, dotu) < 0) + if(statcheck(&buf[i], m) < 0) break; ss += m; n++; @@ -43,7 +43,7 @@ dirpackage(uchar *buf, long ts, Dir **d, int dotu) nn = 0; for(i = 0; i < ts; i += m){ m = BIT16SZ + GBIT16((uchar*)&buf[i]); - if(nn >= n || convM2Du(&buf[i], m, *d + nn, s, dotu) != m){ + if(nn >= n || convM2D(&buf[i], m, *d + nn, s) != m){ free(*d); *d = nil; return -1; @@ -66,7 +66,7 @@ fsdirread(CFid *fid, Dir **d) return -1; ts = fsread(fid, buf, DIRMAX); if(ts >= 0) - ts = dirpackage(buf, ts, d, fid->fs->dotu); + ts = dirpackage(buf, ts, d); free(buf); return ts; } @@ -92,9 +92,9 @@ fsdirreadall(CFid *fid, Dir **d) ts += n; } if(ts >= 0){ - ts = dirpackage(buf, ts, d, fid->fs->dotu); + ts = dirpackage(buf, ts, d); if(ts < 0) - werrstr("malformed directory contents [dotu=%d]", fid->fs->dotu); + werrstr("malformed directory contents"); } free(buf); if(ts == 0 && n < 0) |