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

kernel/disk_device_manager: Use addr_t in UserDataWriter.

Browse Source 
This code was not touched since 2005, and even then, that was just
a file rename. So it seems it simply predates addr_t.
This commit is contained in:
Augustin Cavalier
2019-09-21 16:13:51 -04:00
parent 0af21102ef
commit e6ee730269
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/disk_device_manager/UserDataWriter.cpp
+6 -10
View File
@@ -6,12 +6,8 @@
#include "UserDataWriter.h" #include "UserDataWriter.h"
using namespace std;
typedef uint8 *addr;
// RelocationEntryList // RelocationEntryList
struct UserDataWriter::RelocationEntryList : Vector<addr*> {}; struct UserDataWriter::RelocationEntryList : Vector<addr_t*> {};
// constructor // constructor
UserDataWriter::UserDataWriter() UserDataWriter::UserDataWriter()
@@ -128,9 +124,9 @@ UserDataWriter::AllocatedSize() const
status_t status_t
UserDataWriter::AddRelocationEntry(void *address) UserDataWriter::AddRelocationEntry(void *address)
{ {
if (fRelocationEntries && (addr)address >= (addr)fBuffer if (fRelocationEntries && (addr_t)address >= (addr_t)fBuffer
&& (addr)address < (addr)fBuffer + fBufferSize - sizeof(void*)) { && (addr_t)address < (addr_t)fBuffer + fBufferSize - sizeof(void*)) {
return fRelocationEntries->PushBack((addr*)address); return fRelocationEntries->PushBack((addr_t*)address);
} }
return B_ERROR; return B_ERROR;
} }
@@ -143,9 +139,9 @@ UserDataWriter::Relocate(void *address)
return B_BAD_VALUE; return B_BAD_VALUE;
int32 count = fRelocationEntries->Count(); int32 count = fRelocationEntries->Count();
for (int32 i = 0; i < count; i++) { for (int32 i = 0; i < count; i++) {
addr *entry = fRelocationEntries->ElementAt(i); addr_t *entry = fRelocationEntries->ElementAt(i);
if (*entry) if (*entry)
*entry += (addr)address - (addr)fBuffer; *entry += (addr_t)address - (addr_t)fBuffer;
} }
return B_OK; return B_OK;
} }