aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrsc <devnull@localhost>2006-02-14 19:41:48 +0000
committerrsc <devnull@localhost>2006-02-14 19:41:48 +0000
commit0870ded11f35f0909faf35eadd29f1bb130a3e4a (patch)
tree1122d5110f81c0a78f67f9cf78494e9f9cf2d38c
parent3b5862ee5ab4452c8b5de2d062d713c843ee1e4f (diff)
downloadplan9port-0870ded11f35f0909faf35eadd29f1bb130a3e4a.tar.gz
plan9port-0870ded11f35f0909faf35eadd29f1bb130a3e4a.tar.bz2
plan9port-0870ded11f35f0909faf35eadd29f1bb130a3e4a.zip
stupid pointer conversions
-rw-r--r--src/cmd/auth/factotum/fs.c6
-rw-r--r--src/cmd/auth/factotum/rpc.c14
2 files changed, 10 insertions, 10 deletions
diff --git a/src/cmd/auth/factotum/fs.c b/src/cmd/auth/factotum/fs.c
index 5e3a64e6..68e86289 100644
--- a/src/cmd/auth/factotum/fs.c
+++ b/src/cmd/auth/factotum/fs.c
@@ -349,18 +349,18 @@ fsread(Req *r)
logread(r);
break;
case Qctl:
- r->fid->aux = (void*)readlist((int)r->fid->aux, keylist, r);
+ r->fid->aux = (void*)(uintptr)readlist((uintptr)r->fid->aux, keylist, r);
respond(r, nil);
break;
case Qneedkey:
needkeyread(r);
break;
case Qprotolist:
- r->fid->aux = (void*)readlist((int)r->fid->aux, protolist, r);
+ r->fid->aux = (void*)(uintptr)readlist((uintptr)r->fid->aux, protolist, r);
respond(r, nil);
break;
case Qconv:
- r->fid->aux = (void*)readlist((int)r->fid->aux, convlist, r);
+ r->fid->aux = (void*)(uintptr)readlist((uintptr)r->fid->aux, convlist, r);
respond(r, nil);
break;
}
diff --git a/src/cmd/auth/factotum/rpc.c b/src/cmd/auth/factotum/rpc.c
index 400b7de5..350a0795 100644
--- a/src/cmd/auth/factotum/rpc.c
+++ b/src/cmd/auth/factotum/rpc.c
@@ -108,24 +108,24 @@ convthread(void *v)
}
c->attr = a;
proto = strfindattr(a, "proto");
- role = strfindattr(a, "role");
-
if(proto == nil){
werrstr("no proto in attrs");
goto out;
}
- if(role == nil){
- werrstr("no role in attrs");
- goto out;
- }
p = protolookup(proto);
if(p == nil){
werrstr("unknown proto %s", proto);
goto out;
}
-
c->proto = p;
+
+ role = strfindattr(a, "role");
+ if(role == nil){
+ werrstr("no role in attrs");
+ goto out;
+ }
+
for(r=p->roles; r->name; r++){
if(strcmp(r->name, role) != 0)
continue;