From 74dd0321756f968c595487f694fbe74ad00f0624 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Tue, 7 Dec 2010 13:34:11 -0500 Subject: delete 9P2000.u thanks to Erik Quanstrom R=rsc http://codereview.appspot.com/3469042 --- src/lib9/convD2M.c | 35 ++--------------------------------- src/lib9/convM2D.c | 36 ++---------------------------------- src/lib9/convM2S.c | 28 +--------------------------- src/lib9/convS2M.c | 42 +++--------------------------------------- 4 files changed, 8 insertions(+), 133 deletions(-) (limited to 'src/lib9') diff --git a/src/lib9/convD2M.c b/src/lib9/convD2M.c index bd8a30b6..30c0d496 100644 --- a/src/lib9/convD2M.c +++ b/src/lib9/convD2M.c @@ -3,7 +3,7 @@ #include uint -sizeD2Mu(Dir *d, int dotu) +sizeD2M(Dir *d) { char *sv[5]; int i, ns, nstr, fixlen; @@ -15,11 +15,6 @@ sizeD2Mu(Dir *d, int dotu) fixlen = STATFIXLEN; nstr = 4; - if(dotu){ - fixlen = STATFIXLENU; - sv[4] = d->ext; - nstr = 5; - } ns = 0; for(i = 0; i < nstr; i++) @@ -30,13 +25,7 @@ sizeD2Mu(Dir *d, int dotu) } uint -sizeD2M(Dir *d) -{ - return sizeD2Mu(d, 0); -} - -uint -convD2Mu(Dir *d, uchar *buf, uint nbuf, int dotu) +convD2M(Dir *d, uchar *buf, uint nbuf) { uchar *p, *ebuf; char *sv[5]; @@ -55,11 +44,6 @@ convD2Mu(Dir *d, uchar *buf, uint nbuf, int dotu) fixlen = STATFIXLEN; nstr = 4; - if(dotu){ - fixlen = STATFIXLENU; - sv[4] = d->ext; - nstr = 5; - } ns = 0; for(i = 0; i < nstr; i++){ @@ -110,23 +94,8 @@ convD2Mu(Dir *d, uchar *buf, uint nbuf, int dotu) p += ns; } - if(dotu){ - PBIT32(p, d->uidnum); - p += BIT32SZ; - PBIT32(p, d->gidnum); - p += BIT32SZ; - PBIT32(p, d->muidnum); - p += BIT32SZ; - } - if(ss != p - buf) return 0; return p - buf; } - -uint -convD2M(Dir *d, uchar *buf, uint nbuf) -{ - return convD2Mu(d, buf, nbuf, 0); -} diff --git a/src/lib9/convM2D.c b/src/lib9/convM2D.c index 52d7fad5..504110b2 100644 --- a/src/lib9/convM2D.c +++ b/src/lib9/convM2D.c @@ -3,7 +3,7 @@ #include int -statchecku(uchar *buf, uint nbuf, int dotu) +statcheck(uchar *buf, uint nbuf) { uchar *ebuf; int i, nstr; @@ -16,33 +16,22 @@ statchecku(uchar *buf, uint nbuf, int dotu) buf += STATFIXLEN - 4 * BIT16SZ; nstr = 4; - if(dotu) - nstr = 5; for(i = 0; i < nstr; i++){ if(buf + BIT16SZ > ebuf) return -1; buf += BIT16SZ + GBIT16(buf); } - if(dotu) - buf += 3*BIT32SZ; - if(buf != ebuf) return -1; return 0; } -int -statcheck(uchar *buf, uint nbuf) -{ - return statchecku(buf, nbuf, 0); -} - static char nullstring[] = ""; uint -convM2Du(uchar *buf, uint nbuf, Dir *d, char *strs, int dotu) +convM2D(uchar *buf, uint nbuf, Dir *d, char *strs) { uchar *p, *ebuf; char *sv[5]; @@ -75,8 +64,6 @@ convM2Du(uchar *buf, uint nbuf, Dir *d, char *strs, int dotu) p += BIT64SZ; nstr = 4; - if(dotu) - nstr = 5; for(i = 0; i < nstr; i++){ if(p + BIT16SZ > ebuf) return 0; @@ -93,25 +80,12 @@ convM2Du(uchar *buf, uint nbuf, Dir *d, char *strs, int dotu) p += ns; } - if(dotu){ - if(p + BIT32SZ*3 > ebuf) - return 0; - d->uidnum = GBIT32(p); - p += BIT32SZ; - d->gidnum = GBIT32(p); - p += BIT32SZ; - d->muidnum = GBIT32(p); - p += BIT32SZ; - } - if(strs){ d->name = sv[0]; d->uid = sv[1]; d->gid = sv[2]; d->muid = sv[3]; d->ext = nullstring; - if(dotu) - d->ext = sv[4]; }else{ d->name = nullstring; d->uid = nullstring; @@ -122,9 +96,3 @@ convM2Du(uchar *buf, uint nbuf, Dir *d, char *strs, int dotu) return p - buf; } - -uint -convM2D(uchar *buf, uint nbuf, Dir *d, char *strs) -{ - return convM2Du(buf, nbuf, d, strs, 0); -} diff --git a/src/lib9/convM2S.c b/src/lib9/convM2S.c index 6a8805c4..a9c9205d 100644 --- a/src/lib9/convM2S.c +++ b/src/lib9/convM2S.c @@ -48,7 +48,7 @@ gqid(uchar *p, uchar *ep, Qid *q) * to test at end of routine. */ uint -convM2Su(uchar *ap, uint nap, Fcall *f, int dotu) +convM2S(uchar *ap, uint nap, Fcall *f) { uchar *p, *ep; uint i, size; @@ -101,12 +101,6 @@ convM2Su(uchar *ap, uint nap, Fcall *f, int dotu) if(p == nil) break; f->uidnum = NOUID; - if(dotu){ - if(p+BIT32SZ > ep) - return 0; - f->uidnum = GBIT32(p); - p += BIT32SZ; - } break; case Tattach: @@ -125,12 +119,6 @@ convM2Su(uchar *ap, uint nap, Fcall *f, int dotu) if(p == nil) break; f->uidnum = NOUID; - if(dotu){ - if(p+BIT32SZ > ep) - return 0; - f->uidnum = GBIT32(p); - p += BIT32SZ; - } break; case Twalk: @@ -175,8 +163,6 @@ convM2Su(uchar *ap, uint nap, Fcall *f, int dotu) p += BIT32SZ; f->mode = GBIT8(p); p += BIT8SZ; - if(dotu) - p = gstring(p, ep, &f->extension); break; case Tread: @@ -246,12 +232,6 @@ convM2Su(uchar *ap, uint nap, Fcall *f, int dotu) case Rerror: p = gstring(p, ep, &f->ename); f->errornum = 0; - if(dotu){ - if(p+BIT32SZ > ep) - return 0; - f->errornum = GBIT32(p); - p += BIT32SZ; - } break; case Rflush: @@ -344,9 +324,3 @@ convM2Su(uchar *ap, uint nap, Fcall *f, int dotu) return size; return 0; } - -uint -convM2S(uchar *ap, uint nap, Fcall *f) -{ - return convM2Su(ap, nap, f, 0); -} diff --git a/src/lib9/convS2M.c b/src/lib9/convS2M.c index 02923bd4..6e9d2719 100644 --- a/src/lib9/convS2M.c +++ b/src/lib9/convS2M.c @@ -46,7 +46,7 @@ stringsz(char *s) } uint -sizeS2Mu(Fcall *f, int dotu) +sizeS2M(Fcall *f) { uint n; int i; @@ -74,8 +74,6 @@ sizeS2Mu(Fcall *f, int dotu) n += BIT32SZ; n += stringsz(f->uname); n += stringsz(f->aname); - if(dotu) - n += BIT32SZ; break; case Tattach: @@ -83,8 +81,6 @@ sizeS2Mu(Fcall *f, int dotu) n += BIT32SZ; n += stringsz(f->uname); n += stringsz(f->aname); - if(dotu) - n += BIT32SZ; break; case Twalk: @@ -106,8 +102,6 @@ sizeS2Mu(Fcall *f, int dotu) n += stringsz(f->name); n += BIT32SZ; n += BIT8SZ; - if(dotu) - n += stringsz(f->extension); break; case Tread: @@ -147,8 +141,6 @@ sizeS2Mu(Fcall *f, int dotu) case Rerror: n += stringsz(f->ename); - if(dotu) - n += BIT32SZ; break; case Rflush: @@ -206,18 +198,12 @@ sizeS2Mu(Fcall *f, int dotu) } uint -sizeS2M(Fcall *f) -{ - return sizeS2Mu(f, 0); -} - -uint -convS2Mu(Fcall *f, uchar *ap, uint nap, int dotu) +convS2M(Fcall *f, uchar *ap, uint nap) { uchar *p; uint i, size; - size = sizeS2Mu(f, dotu); + size = sizeS2M(f); if(size == 0) return 0; if(size > nap) @@ -253,11 +239,6 @@ convS2Mu(Fcall *f, uchar *ap, uint nap, int dotu) p += BIT32SZ; p = pstring(p, f->uname); p = pstring(p, f->aname); - if(dotu){ - f->uidnum = NOUID; - PBIT32(p, f->uidnum); - p += BIT32SZ; - } break; case Tattach: @@ -267,11 +248,6 @@ convS2Mu(Fcall *f, uchar *ap, uint nap, int dotu) p += BIT32SZ; p = pstring(p, f->uname); p = pstring(p, f->aname); - if(dotu){ - f->uidnum = NOUID; - PBIT32(p, f->uidnum); - p += BIT32SZ; - } break; case Twalk: @@ -303,8 +279,6 @@ convS2Mu(Fcall *f, uchar *ap, uint nap, int dotu) p += BIT32SZ; PBIT8(p, f->mode); p += BIT8SZ; - if(dotu) - p = pstring(p, f->extension); break; case Tread: @@ -357,10 +331,6 @@ convS2Mu(Fcall *f, uchar *ap, uint nap, int dotu) case Rerror: p = pstring(p, f->ename); - if(dotu){ - PBIT32(p, f->errornum); - p += BIT32SZ; - } break; case Rflush: @@ -427,9 +397,3 @@ convS2Mu(Fcall *f, uchar *ap, uint nap, int dotu) return 0; return size; } - -uint -convS2M(Fcall *f, uchar *ap, uint nap) -{ - return convS2Mu(f, ap, nap, 0); -} -- cgit v1.2.3