Changeset 492 for trunk/kernel/mm/kcm.c

Timestamp:

Aug 22, 2018, 11:55:48 PM (6 years ago)

Author:

viala@…

Message:

Refactoring assert calling to conform with new assert macro.

Made with this command for the general case.
find ./kernel/ hal/ -name "*.c" | xargs sed -i -e '/assert(/ s/,[ ]*FUNCTION[ ]*,/,/'

And some done by hand.

File:

• trunk/kernel/mm/kcm.c (modified) (4 diffs)

trunk/kernel/mm/kcm.c

@@ -56 +56 @@
 #endif
 
-        assert( kcm_page->active , __FUNCTION__ , "kcm_page should be active" );
+        assert( kcm_page->active , "kcm_page should be active" );
 
         // get first block available
         int32_t index = bitmap_ffs( kcm_page->bitmap , kcm->blocks_nr );
 
-        assert( (index != -1) , __FUNCTION__ , "kcm_page should not be full" );
+        assert( (index != -1) , "kcm_page should not be full" );
 
         // allocate block
@@ -113 +113 @@
         index = ((uint8_t *)ptr - (uint8_t *)kcm_page - CONFIG_KCM_SLOT_SIZE) / kcm->block_size;
 
-        assert( !bitmap_state( kcm_page->bitmap , index ) , __FUNCTION__ , "page already freed" );
-        assert( (kcm_page->count > 0) , __FUNCTION__ , "count already zero" );
+        assert( !bitmap_state( kcm_page->bitmap , index ) , "page already freed" );
+        assert( (kcm_page->count > 0) , "count already zero" );
 
         bitmap_set( kcm_page->bitmap , index );
@@ -216 +216 @@
         // the kcm_page descriptor mut fit in the KCM slot
         assert( (sizeof(kcm_page_t) <= CONFIG_KCM_SLOT_SIZE) ,
-                 __FUNCTION__ , "KCM slot too small\n" );
+                "KCM slot too small\n" );
 
         // initialize lock
@@ -329 +329 @@
         kcm_t      * kcm;
 
-        assert( (ptr != NULL) , __FUNCTION__ , "pointer cannot be NULL" );
+        assert( (ptr != NULL) , "pointer cannot be NULL" );
 
         kcm_page = (kcm_page_t *)((intptr_t)ptr & ~CONFIG_PPM_PAGE_MASK);