fergalmoran/ladybird
1
0
Fork 0
mirror of https://github.com/fergalmoran/ladybird.git synced 2026-01-06 08:36:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Kernel: Make SysFS and ProcFS generator functions return KResult

Browse Source 
This allows us to propagate a whole bunch of KBufferBuilder errors.
This commit is contained in:
Andreas Kling
2021-09-06 18:41:16 +02:00
parent 2065ced8f6
commit 9db8a14264
5 changed files with 55 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Kernel/Bus/USB/SysFSUSB.cpp
View File

@@ -23,7 +23,7 @@ SysFSUSBDeviceInformation::~SysFSUSBDeviceInformation()
{
}
bool SysFSUSBDeviceInformation::output(KBufferBuilder& builder)
KResult SysFSUSBDeviceInformation::try_generate(KBufferBuilder& builder)
{
VERIFY(m_lock.is_locked());
JsonArraySerializer array { builder };
@@ -44,7 +44,7 @@ bool SysFSUSBDeviceInformation::output(KBufferBuilder& builder)
obj.add("num_configurations", m_device->device_descriptor().num_configurations);
obj.finish();
array.finish();
return true;
return KSuccess;
}
KResult SysFSUSBDeviceInformation::refresh_data(FileDescription& description) const
@@ -55,8 +55,7 @@ KResult SysFSUSBDeviceInformation::refresh_data(FileDescription& description) co
cached_data = TRY(adopt_nonnull_own_or_enomem(new (nothrow) SysFSInodeData));
}
KBufferBuilder builder;
if (!const_cast<SysFSUSBDeviceInformation&>(*this).output(builder))
return ENOENT;
TRY(const_cast<SysFSUSBDeviceInformation&>(*this).try_generate(builder));
auto& typed_cached_data = static_cast<SysFSInodeData&>(*cached_data);
typed_cached_data.buffer = builder.build();
if (!typed_cached_data.buffer)