From e6ee730269b80084f147ee2082c3e7f8be5998ef Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sat, 21 Sep 2019 16:13:51 -0400 Subject: [PATCH] kernel/disk_device_manager: Use addr_t in UserDataWriter. This code was not touched since 2005, and even then, that was just a file rename. So it seems it simply predates addr_t. --- .../disk_device_manager/UserDataWriter.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/system/kernel/disk_device_manager/UserDataWriter.cpp b/src/system/kernel/disk_device_manager/UserDataWriter.cpp index 9dd757ea45..4b76ffd758 100644 --- a/src/system/kernel/disk_device_manager/UserDataWriter.cpp +++ b/src/system/kernel/disk_device_manager/UserDataWriter.cpp @@ -6,12 +6,8 @@ #include "UserDataWriter.h" -using namespace std; - -typedef uint8 *addr; - // RelocationEntryList -struct UserDataWriter::RelocationEntryList : Vector {}; +struct UserDataWriter::RelocationEntryList : Vector {}; // constructor UserDataWriter::UserDataWriter() @@ -128,9 +124,9 @@ UserDataWriter::AllocatedSize() const status_t UserDataWriter::AddRelocationEntry(void *address) { - if (fRelocationEntries && (addr)address >= (addr)fBuffer - && (addr)address < (addr)fBuffer + fBufferSize - sizeof(void*)) { - return fRelocationEntries->PushBack((addr*)address); + if (fRelocationEntries && (addr_t)address >= (addr_t)fBuffer + && (addr_t)address < (addr_t)fBuffer + fBufferSize - sizeof(void*)) { + return fRelocationEntries->PushBack((addr_t*)address); } return B_ERROR; } @@ -143,9 +139,9 @@ UserDataWriter::Relocate(void *address) return B_BAD_VALUE; int32 count = fRelocationEntries->Count(); for (int32 i = 0; i < count; i++) { - addr *entry = fRelocationEntries->ElementAt(i); + addr_t *entry = fRelocationEntries->ElementAt(i); if (*entry) - *entry += (addr)address - (addr)fBuffer; + *entry += (addr_t)address - (addr_t)fBuffer; } return B_OK; }