diff options
| author | cinap_lenrek <cinap_lenrek@felloff.net> | 2016-03-10 03:02:28 +0100 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2016-03-10 03:02:28 +0100 |
| commit | 595501b005f591527680080e606c9ab0f1d99701 (patch) | |
| tree | 729ef2899e7ea7f21ec630fa72d00d2f5a1b21d6 /sys/src/9 | |
| parent | 0aa5b01fab130618fa63e9a6684265904a9f98b5 (diff) | |
kernel: make fversion()/mntversion() types consistent
Diffstat (limited to 'sys/src/9')
| -rw-r--r-- | sys/src/9/port/auth.c | 9 | ||||
| -rw-r--r-- | sys/src/9/port/devmnt.c | 4 | ||||
| -rw-r--r-- | sys/src/9/port/portfns.h | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/sys/src/9/port/auth.c b/sys/src/9/port/auth.c index 04b96a57d..ff3c9a8cd 100644 --- a/sys/src/9/port/auth.c +++ b/sys/src/9/port/auth.c @@ -22,18 +22,17 @@ iseve(void) uintptr sysfversion(va_list list) { - uint msize, arglen; + int msize, arglen, fd; char *vers; Chan *c; - int fd; fd = va_arg(list, int); - msize = va_arg(list, uint); + msize = va_arg(list, int); vers = va_arg(list, char*); - arglen = va_arg(list, uint); + arglen = va_arg(list, int); validaddr((uintptr)vers, arglen, 1); /* check there's a NUL in the version string */ - if(arglen==0 || memchr(vers, 0, arglen)==0) + if(arglen <= 0 || memchr(vers, 0, arglen) == nil) error(Ebadarg); c = fdtochan(fd, ORDWR, 0, 1); if(waserror()){ diff --git a/sys/src/9/port/devmnt.c b/sys/src/9/port/devmnt.c index cd363319b..52f093a1a 100644 --- a/sys/src/9/port/devmnt.c +++ b/sys/src/9/port/devmnt.c @@ -90,7 +90,7 @@ mntreset(void) /* * Version is not multiplexed: message sent only once per connection. */ -long +int mntversion(Chan *c, char *version, int msize, int returnlen) { Fcall f; @@ -259,7 +259,7 @@ mntauth(Chan *c, char *spec) m = c->mux; if(m == nil){ - mntversion(c, VERSION9P, MAXRPC, 0); + mntversion(c, nil, 0, 0); m = c->mux; if(m == nil) error(Enoversion); diff --git a/sys/src/9/port/portfns.h b/sys/src/9/port/portfns.h index 941bb95fc..0c1ce0bfc 100644 --- a/sys/src/9/port/portfns.h +++ b/sys/src/9/port/portfns.h @@ -176,7 +176,7 @@ void mmurelease(Proc*); void mmuswitch(Proc*); Chan* mntattach(Chan*, Chan*, char*, int); Chan* mntauth(Chan*, char*); -long mntversion(Chan*, char*, int, int); +int mntversion(Chan*, char*, int, int); void mouseresize(void); void mountfree(Mount*); ulong ms2tk(ulong); |