Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BAN: memcpy only if we already have a buffer

This commit is contained in:
Bananymous 2023-01-13 00:15:40 +02:00
parent 75ee592fb5
commit c33c6c5785
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BAN/BAN/String.cpp
View File

@ -214,7 +214,8 @@ namespace BAN
void* new_data = BAN::allocator(new_cap);
if (new_data == nullptr)
return Error::FromString("String: Could not allocate memory");
memcpy(new_data, m_data, m_size + 1);
if (m_data)
memcpy(new_data, m_data, m_size + 1);
BAN::deallocator(m_data);
m_data = (char*)new_data;
m_capasity = new_cap;

12
BAN/include/BAN/Queue.h
View File

@ -31,7 +31,7 @@ namespace BAN
T& Front();
private:
[[nodiscard]] ErrorOr<void> VerifyCapacity(size_type size);
[[nodiscard]] ErrorOr<void> EnsureCapacity(size_type size);
private:
T* m_data = nullptr;
@ -50,7 +50,7 @@ namespace BAN
template<typename T>
ErrorOr<void> Queue<T>::Push(const T& value)
{
TRY(VerifyCapacity(m_size + 1));
TRY(EnsureCapacity(m_size + 1));
m_data[m_size++] = value;
return {};
}
@ -90,19 +90,17 @@ namespace BAN
}
template<typename T>
ErrorOr<void> Queue<T>::VerifyCapacity(size_type size)
ErrorOr<void> Queue<T>::EnsureCapacity(size_type size)
{
if (m_capacity > size)
return {};
size_type new_cap = BAN::Math::max<size_type>(size, m_capacity * 3 / 2);
void* new_data = BAN::allocator(new_cap * sizeof(T));
if (new_data == nullptr)
return Error::FromString("Queue: Could not allocate memory");
memcpy(new_data, m_data, m_size * sizeof(T));
if (m_data)
memcpy(new_data, m_data, m_size * sizeof(T));
BAN::deallocator(m_data);
m_data = (T*)new_data;
m_capacity = new_cap;

3
BAN/include/BAN/Vector.h
View File

@ -211,7 +211,8 @@ namespace BAN
void* new_data = BAN::allocator(new_cap * sizeof(T));
if (new_data == nullptr)
return Error::FromString("Vector: Could not allocate memory");
memcpy(new_data, m_data, m_size * sizeof(T));
if (m_data)
memcpy(new_data, m_data, m_size * sizeof(T));
BAN::deallocator(m_data);
m_data = (T*)new_data;
m_capasity = new_cap;