[PATCH v2 4/8] ntdll: Introduce a new heap block_init_used helper.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/ntdll/heap.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c
index 8f3c549b7ab..3f7cd19f540 100644
--- a/dlls/ntdll/heap.c
+++ b/dlls/ntdll/heap.c
@@ -749,6 +749,15 @@ static inline BOOL subheap_decommit( const struct heap *heap, SUBHEAP *subheap,
     return TRUE;
 }

+static void block_init_used( struct block *block, ULONG flags, SIZE_T size )
+{
+    block_set_type( block, BLOCK_TYPE_USED );
+    block_set_flags( block, 0, BLOCK_USER_FLAGS( flags ) );
+    block->tail_size = block_get_size( block ) - sizeof(*block) - size;
+    initialize_block( block, 0, size, flags );
+    mark_block_tail( block, flags );
+}
+
 static void block_init_free( struct block *block, ULONG flags, SUBHEAP *subheap, SIZE_T block_size )
 {
     const char *end = (char *)block + block_size, *commit_end = subheap_commit_end( subheap );
@@ -1580,11 +1589,7 @@ static NTSTATUS heap_allocate_block( struct heap *heap, ULONG flags, SIZE_T bloc
         insert_free_block( heap, flags, subheap, next );
     }

-    block_set_type( block, BLOCK_TYPE_USED );
-    block_set_flags( block, ~0, BLOCK_USER_FLAGS( flags ) );
-    block->tail_size = block_get_size( block ) - sizeof(*block) - size;
-    initialize_block( block, 0, size, flags );
-    mark_block_tail( block, flags );
+    block_init_used( block, flags, size );

if ((next = next_block( subheap, block ))) block_set_flags( next, BLOCK_FLAG_PREV_FREE, 0 );