apio/Luna
1
1
Fork 0
Code Issues Pull Requests Actions Projects Releases 8 Wiki Activity

TmpFS: Use StaticString<128> instead of char[128]
All checks were successful
continuous-integration/drone/pr Build is passing
Details

Browse Source
This commit is contained in:
apio 2023-02-27 15:14:07 +01:00
parent 76f9bd8112
commit 32dc5473a5
Signed by: apio
GPG Key ID: B8A7D06E42258954
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/src/fs/tmpfs/FileSystem.cpp
View File

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

4
kernel/src/fs/tmpfs/FileSystem.h
View File

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