i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gcc4 build fix

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22986 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Marcus Overhagen
2007-11-24 11:20:38 +00:00
parent 187574cf69
commit 91b75ef2fd
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/bus_managers/usb/Transfer.cpp
+3 -3
View File
@@ -114,7 +114,7 @@ Transfer::AdvanceByFragment(size_t actualLength)
continue; continue;
} }
fVector[i].iov_base = (void *)((uint8 *)fVector[i].iov_base + length); fVector[i].iov_base = (uint8 *)fVector[i].iov_base + length;
fVector[i].iov_len -= length; fVector[i].iov_len -= length;
break; break;
} }
@@ -154,7 +154,7 @@ Transfer::InitKernelAccess()
} }
for (size_t i = 0; i < fVectorCount; i++) { for (size_t i = 0; i < fVectorCount; i++) {
(uint8 *)vector[i].iov_base -= (uint8 *)areaInfo.address; vector[i].iov_base = (uint8 *)vector[i].iov_base - (addr_t)areaInfo.address;
if ((size_t)vector[i].iov_base > areaInfo.size if ((size_t)vector[i].iov_base > areaInfo.size
|| (size_t)vector[i].iov_base + vector[i].iov_len > areaInfo.size) { || (size_t)vector[i].iov_base + vector[i].iov_len > areaInfo.size) {
@@ -183,7 +183,7 @@ Transfer::PrepareKernelAccess()
return fClonedArea; return fClonedArea;
for (size_t i = 0; i < fVectorCount; i++) for (size_t i = 0; i < fVectorCount; i++)
(uint8 *)fVector[i].iov_base += (addr_t)clonedMemory; fVector[i].iov_base = (uint8 *)fVector[i].iov_base + (addr_t)clonedMemory;
return B_OK; return B_OK;
} }