Selaa lähdekoodia

AK+Kernel: Make BitmapView read-only

Ben Wiederhake 3 vuotta sitten
vanhempi
commit
bf7a2ff941
3 muutettua tiedostoa jossa 2 lisäystä ja 11 poistoa
  1. 0 1
      AK/Bitmap.h
  2. 0 8
      AK/BitmapView.h
  3. 2 2
      Kernel/FileSystem/Ext2FileSystem.h

+ 0 - 1
AK/Bitmap.h

@@ -37,7 +37,6 @@ public:
     {
     }
 
-    [[nodiscard]] BitmapView view() { return { m_data, m_size }; }
     [[nodiscard]] BitmapView const view() const { return { m_data, m_size }; }
 
     Bitmap(Bitmap&& other)

+ 0 - 8
AK/BitmapView.h

@@ -32,14 +32,6 @@ public:
         VERIFY(index < m_size);
         return 0 != (m_data[index / 8] & (1u << (index % 8)));
     }
-    void set(size_t index, bool value) const
-    {
-        VERIFY(index < m_size);
-        if (value)
-            m_data[index / 8] |= static_cast<u8>((1u << (index % 8)));
-        else
-            m_data[index / 8] &= static_cast<u8>(~(1u << (index % 8)));
-    }
 
     size_t count_slow(bool value) const
     {

+ 2 - 2
Kernel/FileSystem/Ext2FileSystem.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <AK/BitmapView.h>
+#include <AK/Bitmap.h>
 #include <AK/HashMap.h>
 #include <Kernel/FileSystem/BlockBasedFileSystem.h>
 #include <Kernel/FileSystem/Inode.h>
@@ -176,7 +176,7 @@ private:
         BlockIndex bitmap_block_index { 0 };
         bool dirty { false };
         NonnullOwnPtr<KBuffer> buffer;
-        BitmapView bitmap(u32 blocks_per_group) { return BitmapView { buffer->data(), blocks_per_group }; }
+        Bitmap bitmap(u32 blocks_per_group) { return Bitmap { buffer->data(), blocks_per_group }; }
     };
 
     ErrorOr<CachedBitmap*> get_bitmap_block(BlockIndex);