RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-28 18:35:09 +00:00
Code Issues Activity Actions

LibCore: Add CDirIterator, and use it in everything rather than readdir

Browse source
This commit is contained in:
Robin Burchell 2019-05-27 09:26:54 +02:00 • committed by Andreas Kling
parent f352a5094d
commit 9d2b08e06e
9 changed files with 152 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

15
LibGUI/GFontDatabase.cpp
View file

@ -1,4 +1,5 @@
#include <LibGUI/GFontDatabase.h>
#include <LibCore/CDirIterator.h>
#include <SharedGraphics/Font.h>
#include <dirent.h>
#include <stdio.h>
@ -15,15 +16,14 @@ GFontDatabase& GFontDatabase::the()
GFontDatabase::GFontDatabase()
{
DIR* dirp = opendir("/res/fonts");
if (!dirp) {
perror("opendir");
CDirIterator di("/res/fonts", CDirIterator::SkipDots);
if (di.has_error()) {
fprintf(stderr, "CDirIterator: %s\n", di.error_string());
exit(1);
}
while (auto* de = readdir(dirp)) {
if (de->d_name[0] == '.')
continue;
auto path = String::format("/res/fonts/%s", de->d_name);
while (di.has_next()) {
String name = di.next_path();
auto path = String::format("/res/fonts/%s", name.characters());
if (auto font = Font::load_from_file(path)) {
Metadata metadata;
metadata.path = path;
@ -32,7 +32,6 @@ GFontDatabase::GFontDatabase()
m_name_to_metadata.set(font->name(), move(metadata));
}
}
closedir(dirp);
}
GFontDatabase::~GFontDatabase()