Index: libcfa/src/heap.cfa
===================================================================
--- libcfa/src/heap.cfa	(revision 10248ae0df771e5e4f6a00c5b977280c857f60bb)
+++ libcfa/src/heap.cfa	(revision 7b149bc32dd824b0b1d56d7ba3ad6199222bc3e5)
@@ -10,6 +10,6 @@
 // Created On       : Tue Dec 19 21:58:35 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 22 13:43:10 2019
-// Update Count     : 514
+// Last Modified On : Thu May  9 16:29:12 2019
+// Update Count     : 516
 //
 
@@ -220,5 +220,5 @@
 		StackLF<Storage> freeList;
 		#else
-		#error undefined lock type for bucket lock
+			#error undefined lock type for bucket lock
 		#endif // SPINLOCK
 		size_t blockSize;								// size of allocations on this list
@@ -234,8 +234,8 @@
 }; // HeapManager
 
+
 static inline size_t getKey( const HeapManager.FreeHeader & freeheader ) { return freeheader.blockSize; }
+
 // statically allocated variables => zero filled.
-
-
 static size_t pageSize;									// architecture pagesize
 static size_t heapExpand;								// sbrk advance
@@ -306,5 +306,5 @@
 	sbrk( (char *)libCeiling( (long unsigned int)End, libAlign() ) - End ); // move start of heap to multiple of alignment
 	heapBegin = heapEnd = sbrk( 0 );					// get new start point
-			   } // HeapManager
+} // HeapManager
 
 
@@ -316,5 +316,5 @@
 	// } // if
 	#endif // __STATISTICS__
-				} // ~HeapManager
+} // ~HeapManager
 
 
@@ -533,5 +533,5 @@
 
 static inline void * doMalloc( size_t size ) with ( heapManager ) {
-	HeapManager.Storage * block;
+	HeapManager.Storage * block;						// pointer to new block of storage
 
 	// Look up size in the size list.  Make sure the user request includes space for the header that must be allocated
@@ -656,5 +656,6 @@
 	__atomic_add_fetch( &allocFree, -size, __ATOMIC_SEQ_CST );
 	if ( traceHeap() ) {
-		char helpText[64];
+		enum { BufferSize = 64 };
+		char helpText[BufferSize];
 		int len = snprintf( helpText, sizeof(helpText), "Free( %p ) size:%zu\n", addr, size );
 		__cfaabi_dbg_bits_write( helpText, len );
@@ -853,5 +854,5 @@
 			// Mapped storage is zero filled, but in debug mode mapped memory is scrubbed in doMalloc, so it has to be reset to zero.
 			if ( ! mapped )
-				#endif // __CFA_DEBUG__
+			#endif // __CFA_DEBUG__
 				memset( (char *)area + usize, '\0', asize - ( (char *)area - (char *)header ) - usize ); // zero-fill back part
 			header->kind.real.blockSize |= 2;			// mark new request as zero fill