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

Kernel: Replace {KString => String}::formatted in determine_boot_device

Browse source
This commit is contained in:
Idan Horowitz 2022-01-13 00:20:42 +02:00 • committed by Brian Gianforcaro
parent ec1f3abd34
commit 6402840670
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Kernel/Storage/StorageManagement.cpp
View file

@ -145,11 +145,14 @@ UNMAP_AFTER_INIT void StorageManagement::determine_boot_device()
// number in the device name indicates the node, e.g. /dev/nvme0n1 we need to append a "p" character // number in the device name indicates the node, e.g. /dev/nvme0n1 we need to append a "p" character
// so that we can properly distinguish the partition index from the device itself // so that we can properly distinguish the partition index from the device itself
char storage_name_last_char = *(storage_device.early_storage_name().end() - 1); char storage_name_last_char = *(storage_device.early_storage_name().end() - 1);
String early_storage_name; OwnPtr<KString> normalized_name;
if (storage_name_last_char >= '0' && storage_name_last_char <= '9') StringView early_storage_name;
early_storage_name = String::formatted("{}p", storage_device.early_storage_name()); if (storage_name_last_char >= '0' && storage_name_last_char <= '9') {
else normalized_name = MUST(KString::formatted("{}p", storage_device.early_storage_name()));
early_storage_name = normalized_name->view();
} else {
early_storage_name = storage_device.early_storage_name(); early_storage_name = storage_device.early_storage_name();
}
auto start_storage_name = storage_name.substring_view(0, min(early_storage_name.length(), storage_name.length())); auto start_storage_name = storage_name.substring_view(0, min(early_storage_name.length(), storage_name.length()));