tstupid pointer conversions - plan9port - [fork] Plan 9 from user space
HTML git clone git://src.adamsgaard.dk/plan9port
DIR Log
DIR Files
DIR Refs
DIR README
DIR LICENSE
---
DIR commit 0870ded11f35f0909faf35eadd29f1bb130a3e4a
DIR parent 3b5862ee5ab4452c8b5de2d062d713c843ee1e4f
HTML Author: rsc <devnull@localhost>
Date: Tue, 14 Feb 2006 19:41:48 +0000
stupid pointer conversions
Diffstat:
M src/cmd/auth/factotum/fs.c | 6 +++---
M src/cmd/auth/factotum/rpc.c | 14 +++++++-------
2 files changed, 10 insertions(+), 10 deletions(-)
---
DIR diff --git a/src/cmd/auth/factotum/fs.c b/src/cmd/auth/factotum/fs.c
t@@ -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;
}
DIR diff --git a/src/cmd/auth/factotum/rpc.c b/src/cmd/auth/factotum/rpc.c
t@@ -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;