mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 05:27:46 +00:00
LibCore: Convert CFile to ObjectPtr
This commit is contained in:
parent
31b38ed88f
commit
8d550c174e
30 changed files with 135 additions and 134 deletions
|
@ -36,14 +36,14 @@ void CConfigFile::reparse()
|
|||
{
|
||||
m_groups.clear();
|
||||
|
||||
CFile file(m_file_name);
|
||||
if (!file.open(CIODevice::OpenMode::ReadOnly))
|
||||
auto file = CFile::construct(m_file_name);
|
||||
if (!file->open(CIODevice::OpenMode::ReadOnly))
|
||||
return;
|
||||
|
||||
HashMap<String, String>* current_group = nullptr;
|
||||
|
||||
while (file.can_read_line()) {
|
||||
auto line = file.read_line(BUFSIZ);
|
||||
while (file->can_read_line()) {
|
||||
auto line = file->read_line(BUFSIZ);
|
||||
auto* cp = (const char*)line.pointer();
|
||||
|
||||
while (*cp && (*cp == ' ' || *cp == '\t' || *cp == '\n'))
|
||||
|
|
|
@ -6,11 +6,6 @@
|
|||
class CFile final : public CIODevice {
|
||||
C_OBJECT(CFile)
|
||||
public:
|
||||
CFile(CObject* parent = nullptr)
|
||||
: CIODevice(parent)
|
||||
{
|
||||
}
|
||||
explicit CFile(const StringView&, CObject* parent = nullptr);
|
||||
virtual ~CFile() override;
|
||||
|
||||
String filename() const { return m_filename; }
|
||||
|
@ -25,6 +20,12 @@ public:
|
|||
bool open(int fd, CIODevice::OpenMode, ShouldCloseFileDescription);
|
||||
|
||||
private:
|
||||
CFile(CObject* parent = nullptr)
|
||||
: CIODevice(parent)
|
||||
{
|
||||
}
|
||||
explicit CFile(const StringView&, CObject* parent = nullptr);
|
||||
|
||||
String m_filename;
|
||||
ShouldCloseFileDescription m_should_close_file_descriptor { ShouldCloseFileDescription::Yes };
|
||||
};
|
||||
|
|
|
@ -10,15 +10,15 @@ HashMap<uid_t, String> CProcessStatisticsReader::s_usernames;
|
|||
|
||||
HashMap<pid_t, CProcessStatistics> CProcessStatisticsReader::get_all()
|
||||
{
|
||||
CFile file("/proc/all");
|
||||
if (!file.open(CIODevice::ReadOnly)) {
|
||||
fprintf(stderr, "CProcessStatisticsReader: Failed to open /proc/all: %s\n", file.error_string());
|
||||
auto file = CFile::construct("/proc/all");
|
||||
if (!file->open(CIODevice::ReadOnly)) {
|
||||
fprintf(stderr, "CProcessStatisticsReader: Failed to open /proc/all: %s\n", file->error_string());
|
||||
return {};
|
||||
}
|
||||
|
||||
HashMap<pid_t, CProcessStatistics> map;
|
||||
|
||||
auto file_contents = file.read_all();
|
||||
auto file_contents = file->read_all();
|
||||
auto json = JsonValue::from_string({ file_contents.data(), file_contents.size() });
|
||||
json.as_array().for_each([&](auto& value) {
|
||||
const JsonObject& process_object = value.as_object();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue