RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 06:47:35 +00:00
Code Issues Activity Actions

Kernel: Use a KString for Custody::m_name

Browse source
This commit is contained in:
Andreas Kling 2021-05-28 11:21:00 +02:00
parent fc9ce22981
commit 9a827ad3da
2 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Kernel/FileSystem/Custody.cpp
View file

@ -12,9 +12,20 @@
namespace Kernel { namespace Kernel {
Custody::Custody(Custody* parent, const StringView& name, Inode& inode, int mount_flags) KResultOr<NonnullRefPtr<Custody>> Custody::create(Custody* parent, StringView name, Inode& inode, int mount_flags)
{
auto name_kstring = KString::try_create(name);
if (!name_kstring)
return ENOMEM;
auto custody = adopt_ref_if_nonnull(new Custody(parent, name_kstring.release_nonnull(), inode, mount_flags));
if (!custody)
return ENOMEM;
return custody.release_nonnull();
}
Custody::Custody(Custody* parent, NonnullOwnPtr<KString> name, Inode& inode, int mount_flags)
: m_parent(parent) : m_parent(parent)
, m_name(name) , m_name(move(name))
, m_inode(inode) , m_inode(inode)
, m_mount_flags(mount_flags) , m_mount_flags(mount_flags)
{ {
@ -34,7 +45,7 @@ String Custody::absolute_path() const
StringBuilder builder; StringBuilder builder;
for (int i = custody_chain.size() - 2; i >= 0; --i) { for (int i = custody_chain.size() - 2; i >= 0; --i) {
builder.append('/'); builder.append('/');
builder.append(custody_chain[i]->name().characters()); builder.append(custody_chain[i]->name());
} }
return builder.to_string(); return builder.to_string();
} }

16
Kernel/FileSystem/Custody.h
View file

@ -12,6 +12,7 @@
#include <Kernel/Forward.h> #include <Kernel/Forward.h>
#include <Kernel/Heap/SlabAllocator.h> #include <Kernel/Heap/SlabAllocator.h>
#include <Kernel/KResult.h> #include <Kernel/KResult.h>
#include <Kernel/KString.h>
namespace Kernel { namespace Kernel {
@ -20,14 +21,7 @@ namespace Kernel {
class Custody : public RefCounted<Custody> { class Custody : public RefCounted<Custody> {
MAKE_SLAB_ALLOCATED(Custody) MAKE_SLAB_ALLOCATED(Custody)
public: public:
static KResultOr<NonnullRefPtr<Custody>> create(Custody* parent, const StringView& name, Inode& inode, int mount_flags) static KResultOr<NonnullRefPtr<Custody>> create(Custody* parent, StringView name, Inode& inode, int mount_flags);
{
auto custody = adopt_ref_if_nonnull(new Custody(parent, name, inode, mount_flags));
if (!custody)
return ENOMEM;
return custody.release_nonnull();
}
~Custody(); ~Custody();
@ -35,17 +29,17 @@ public:
const Custody* parent() const { return m_parent.ptr(); } const Custody* parent() const { return m_parent.ptr(); }
Inode& inode() { return *m_inode; } Inode& inode() { return *m_inode; }
const Inode& inode() const { return *m_inode; } const Inode& inode() const { return *m_inode; }
const String& name() const { return m_name; } StringView name() const { return m_name->view(); }
String absolute_path() const; String absolute_path() const;
int mount_flags() const { return m_mount_flags; } int mount_flags() const { return m_mount_flags; }
bool is_readonly() const; bool is_readonly() const;
private: private:
Custody(Custody* parent, const StringView& name, Inode&, int mount_flags); Custody(Custody* parent, NonnullOwnPtr<KString> name, Inode&, int mount_flags);
RefPtr<Custody> m_parent; RefPtr<Custody> m_parent;
String m_name; NonnullOwnPtr<KString> m_name;
NonnullRefPtr<Inode> m_inode; NonnullRefPtr<Inode> m_inode;
int m_mount_flags { 0 }; int m_mount_flags { 0 };
}; };