xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

kernel: make fversion()/mntversion() types consistent

Browse source
This commit is contained in:
cinap_lenrek 2016-03-10 03:02:28 +01:00
parent 0aa5b01fab
commit 595501b005
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sys/src/9/port/auth.c
View file

@ -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()){

4
sys/src/9/port/devmnt.c
View file

@ -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);

2
sys/src/9/port/portfns.h
View file

@ -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);