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/lib9/convS2M.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/lib9/convS2M.c')
| -rw-r--r-- | src/lib9/convS2M.c | 42 |
1 files changed, 3 insertions, 39 deletions
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); -} |