From 848b781d114cbf5cd245273f37be97f64047c8cc Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Tue, 3 Nov 2009 19:25:23 -0500 Subject: [PATCH] macos 10.6 64bit trace fixes the 64 bit pointer massaging was incomplete for kernel tracing on macos. add in the missing cases. Change-Id: I38eb608c233819ab437adec25e2cd3afac3e234e Reviewed-on: http://gerrit.openafs.org/771 Tested-by: Derrick Brashear Reviewed-by: Derrick Brashear --- src/afs/afs_icl.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/afs/afs_icl.c b/src/afs/afs_icl.c index 280810bf4..7ced4f40b 100644 --- a/src/afs/afs_icl.c +++ b/src/afs/afs_icl.c @@ -254,12 +254,12 @@ Afscall_icl(long opcode, long p1, long p2, long p3, long p4, long *retval) temp = strlen(tlp->name) + 1; if (temp > p4) return EINVAL; - AFS_COPYOUT(tlp->name, (char *)p3, temp, code); + AFS_COPYOUT(tlp->name, AFSKPTR(p3), temp, code); break; case ICL_OP_CLRLOG: /* clear specified log */ /* zero out the specified log: p1=logname */ - AFS_COPYINSTR((char *)p1, tname, sizeof(tname), &temp, code); + AFS_COPYINSTR(AFSKPTR(p1), tname, sizeof(tname), &temp, code); if (code) return code; logp = afs_icl_FindLog(tname); @@ -271,7 +271,7 @@ Afscall_icl(long opcode, long p1, long p2, long p3, long p4, long *retval) case ICL_OP_CLRSET: /* clear specified set */ /* zero out the specified set: p1=setname */ - AFS_COPYINSTR((char *)p1, tname, sizeof(tname), &temp, code); + AFS_COPYINSTR(AFSKPTR(p1), tname, sizeof(tname), &temp, code); if (code) return code; setp = afs_icl_FindSet(tname); @@ -313,15 +313,15 @@ Afscall_icl(long opcode, long p1, long p2, long p3, long p4, long *retval) temp = strlen(setp->name) + 1; if (temp > p3) return EINVAL; - AFS_COPYOUT(setp->name, (char *)p2, temp, code); + AFS_COPYOUT(setp->name, AFSKPTR(p2), temp, code); if (!code) /* copy out size of log */ - AFS_COPYOUT((char *)&setp->states, (char *)p4, sizeof(afs_int32), + AFS_COPYOUT((char *)&setp->states, AFSKPTR(p4), sizeof(afs_int32), code); break; case ICL_OP_SETSTAT: /* set status on a set */ /* activate the specified set: p1=setname, p2=op */ - AFS_COPYINSTR((char *)p1, tname, sizeof(tname), &temp, code); + AFS_COPYINSTR(AFSKPTR(p1), tname, sizeof(tname), &temp, code); if (code) return code; setp = afs_icl_FindSet(tname); @@ -352,7 +352,7 @@ Afscall_icl(long opcode, long p1, long p2, long p3, long p4, long *retval) case ICL_OP_SETLOGSIZE: /* set size of log */ /* set the size of the specified log: p1=logname, p2=size (in words) */ - AFS_COPYINSTR((char *)p1, tname, sizeof(tname), &temp, code); + AFS_COPYINSTR(AFSKPTR(p1), tname, sizeof(tname), &temp, code); if (code) return code; logp = afs_icl_FindLog(tname); @@ -364,30 +364,30 @@ Afscall_icl(long opcode, long p1, long p2, long p3, long p4, long *retval) case ICL_OP_GETLOGINFO: /* get size of log */ /* zero out the specified log: p1=logname, p2=&logSize, p3=&allocated */ - AFS_COPYINSTR((char *)p1, tname, sizeof(tname), &temp, code); + AFS_COPYINSTR(AFSKPTR(p1), tname, sizeof(tname), &temp, code); if (code) return code; logp = afs_icl_FindLog(tname); if (!logp) return ENOENT; allocated = !!logp->datap; - AFS_COPYOUT((char *)&logp->logSize, (char *)p2, sizeof(afs_int32), + AFS_COPYOUT((char *)&logp->logSize, AFSKPTR(p2), sizeof(afs_int32), code); if (!code) - AFS_COPYOUT((char *)&allocated, (char *)p3, sizeof(afs_int32), + AFS_COPYOUT((char *)&allocated, AFSKPTR(p3), sizeof(afs_int32), code); afs_icl_LogRele(logp); break; case ICL_OP_GETSETINFO: /* get state of set */ /* zero out the specified set: p1=setname, p2=&state */ - AFS_COPYINSTR((char *)p1, tname, sizeof(tname), &temp, code); + AFS_COPYINSTR(AFSKPTR(p1), tname, sizeof(tname), &temp, code); if (code) return code; setp = afs_icl_FindSet(tname); if (!setp) return ENOENT; - AFS_COPYOUT((char *)&setp->states, (char *)p2, sizeof(afs_int32), + AFS_COPYOUT((char *)&setp->states, AFSKPTR(p2), sizeof(afs_int32), code); afs_icl_SetRele(setp); break; -- 2.39.5