Compare commits

..

2 Commits

Author SHA1 Message Date
32dc5473a5
TmpFS: Use StaticString<128> instead of char[128]
All checks were successful
continuous-integration/drone/pr Build is passing
2023-02-27 15:14:07 +01:00
76f9bd8112
luna: Add StaticString, an OOP char[] 2023-02-27 15:13:23 +01:00
3 changed files with 56 additions and 6 deletions

View File

@ -45,7 +45,7 @@ namespace TmpFS
{
for (const auto& entry : m_entries)
{
if (!strcmp(name, entry.name)) return entry.inode;
if (!strcmp(name, entry.name.chars())) return entry.inode;
}
return err(ENOENT);
@ -53,9 +53,7 @@ namespace TmpFS
Result<void> DirInode::add_entry(SharedPtr<VFS::Inode> inode, const char* name)
{
Entry entry;
entry.inode = inode;
strlcpy(entry.name, name, sizeof(entry.name));
Entry entry { inode, name };
TRY(m_entries.try_append(move(entry)));

View File

@ -2,7 +2,7 @@
#include "fs/VFS.h"
#include <luna/Atomic.h>
#include <luna/Badge.h>
#include <luna/OwnedStringView.h>
#include <luna/StaticString.h>
#include <luna/Vector.h>
namespace TmpFS
@ -110,7 +110,7 @@ namespace TmpFS
struct Entry
{
SharedPtr<VFS::Inode> inode;
char name[128];
StaticString<128> name;
};
Vector<Entry> m_entries;

View File

@ -0,0 +1,52 @@
#pragma once
#include <luna/CString.h>
#include <luna/Types.h>
template <usize Size> class StaticString
{
public:
StaticString() = default;
StaticString(const char* string)
{
adopt(string);
}
void adopt(const char* string)
{
usize length = strlcpy(m_buffer, string, sizeof(m_buffer));
if (length > Size) { m_length = Size; }
else
m_length = length;
}
StaticString<Size>& operator=(const char* string)
{
adopt(string);
return *this;
}
template <usize OSize> StaticString<Size>& operator=(const StaticString<OSize>& string)
{
if constexpr (OSize == Size)
{
if (this == &string) return *this;
}
adopt(string.chars());
return *this;
}
const char* chars() const
{
return m_buffer;
}
usize length() const
{
return m_length;
}
private:
char m_buffer[Size + 1];
usize m_length { 0 };
};