Compare commits
No commits in common. "bd757d204ed6a8415c1eeb677faacb7d5423ae99" and "d363d5e91584b92dc1506a871c1421980e7b2f77" have entirely different histories.
bd757d204e
...
d363d5e915
@ -431,7 +431,7 @@ namespace MemoryManager
|
||||
|
||||
TRY(result.try_append(0)); // null terminator
|
||||
|
||||
return String { result.release_data() };
|
||||
return String::from_cstring(result.data());
|
||||
}
|
||||
|
||||
bool validate_access(const void* mem, usize size, int flags)
|
||||
|
@ -31,8 +31,6 @@ class Buffer
|
||||
return m_data;
|
||||
}
|
||||
|
||||
u8* release_data();
|
||||
|
||||
u8* end()
|
||||
{
|
||||
return m_data + m_size;
|
||||
|
@ -134,14 +134,6 @@ template <typename T> class Vector
|
||||
return m_data;
|
||||
}
|
||||
|
||||
T* release_data()
|
||||
{
|
||||
T* data = m_data;
|
||||
m_data = nullptr;
|
||||
m_size = m_capacity = 0;
|
||||
return data;
|
||||
}
|
||||
|
||||
Slice<T> slice()
|
||||
{
|
||||
return { m_data, m_size };
|
||||
|
@ -152,6 +152,6 @@ namespace Base64
|
||||
u8 nul_byte = '\0';
|
||||
TRY(buf.append_data(&nul_byte, 1));
|
||||
|
||||
return String { (char*)buf.release_data() };
|
||||
return String::from_cstring((char*)buf.data());
|
||||
}
|
||||
}
|
||||
|
@ -52,10 +52,3 @@ Result<void> Buffer::append_data(const u8* data, usize size)
|
||||
|
||||
return {};
|
||||
}
|
||||
|
||||
u8* Buffer::release_data()
|
||||
{
|
||||
u8* data = m_data;
|
||||
m_data = nullptr;
|
||||
return data;
|
||||
}
|
||||
|
@ -140,7 +140,7 @@ Result<String> String::vformat(StringView fmt, va_list ap)
|
||||
|
||||
TRY(buf.try_append(0));
|
||||
|
||||
return String { buf.release_data() };
|
||||
return from_cstring(buf.data());
|
||||
}
|
||||
|
||||
Result<String> String::from_cstring(const char* str)
|
||||
|
@ -61,5 +61,5 @@ Result<String> StringBuilder::string()
|
||||
char nul = '\0';
|
||||
TRY(m_data.append_data((u8*)&nul, 1));
|
||||
|
||||
return String { (char*)m_data.release_data() };
|
||||
return String::from_cstring((const char*)m_data.data());
|
||||
}
|
||||
|
@ -143,7 +143,7 @@ namespace os
|
||||
|
||||
TRY(data.try_append('\0'));
|
||||
|
||||
return String { data.release_data() };
|
||||
return String::from_cstring(data.data());
|
||||
}
|
||||
|
||||
Result<String> File::read_all_as_string()
|
||||
|
Loading…
Reference in New Issue
Block a user