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

AK: Make Bitmap use size_t for its size

Browse source 
Also rework its API's to return Optional<size_t> instead of int with -1
as the error value.
This commit is contained in:
Andreas Kling 2020-02-24 09:55:46 +01:00
parent b813b2f871
commit 0763f67043
4 changed files with 34 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Kernel/FileSystem/Ext2FileSystem.cpp
View file

@ -1130,14 +1130,14 @@ Vector<Ext2FS::BlockIndex> Ext2FS::allocate_blocks(GroupIndex preferred_group_in
auto block_bitmap = Bitmap::wrap(cached_bitmap.buffer.data(), blocks_in_group);
BlockIndex first_block_in_group = (group_index - 1) * blocks_per_group() + first_block_index();
int free_region_size = 0;
int first_unset_bit_index = block_bitmap.find_longest_range_of_unset_bits(count - blocks.size(), free_region_size);
ASSERT(first_unset_bit_index != -1);
size_t free_region_size = 0;
auto first_unset_bit_index = block_bitmap.find_longest_range_of_unset_bits(count - blocks.size(), free_region_size);
ASSERT(first_unset_bit_index.has_value());
#ifdef EXT2_DEBUG
dbg() << "Ext2FS: allocating free region of size: " << free_region_size << "[" << group_index << "]";
#endif
for (int i = 0; i < free_region_size; ++i) {
BlockIndex block_index = (unsigned)(first_unset_bit_index + i) + first_block_in_group;
for (size_t i = 0; i < free_region_size; ++i) {
BlockIndex block_index = (first_unset_bit_index.value() + i) + first_block_in_group;
set_block_allocation_state(block_index, true);
blocks.unchecked_append(block_index);
#ifdef EXT2_DEBUG
@ -1198,7 +1198,7 @@ unsigned Ext2FS::find_a_free_inode(GroupIndex preferred_group, off_t expected_si
auto& cached_bitmap = get_bitmap_block(bgd.bg_inode_bitmap);
auto inode_bitmap = Bitmap::wrap(cached_bitmap.buffer.data(), inodes_in_group);
for (int i = 0; i < inode_bitmap.size(); ++i) {
for (size_t i = 0; i < inode_bitmap.size(); ++i) {
if (inode_bitmap.get(i))
continue;
first_free_inode_in_group = first_inode_in_group + i;

2
Kernel/VM/InodeVMObject.cpp
View file

@ -78,7 +78,7 @@ size_t InodeVMObject::amount_clean() const
size_t InodeVMObject::amount_dirty() const
{
size_t count = 0;
for (int i = 0; i < m_dirty_pages.size(); ++i) {
for (size_t i = 0; i < m_dirty_pages.size(); ++i) {
if (m_dirty_pages.get(i))
++count;
}

2
Kernel/VM/Region.cpp
View file

@ -164,7 +164,7 @@ u32 Region::cow_pages() const
if (!m_cow_map)
return 0;
u32 count = 0;
for (int i = 0; i < m_cow_map->size(); ++i)
for (size_t i = 0; i < m_cow_map->size(); ++i)
count += m_cow_map->get(i);
return count;
}