Changeset 492 for trunk/kernel/libk

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.

Location:

trunk/kernel/libk

Files:

• grdxt.c (modified) (4 diffs)
• htab.c (modified) (1 diff)
• xhtab.c (modified) (1 diff)

trunk/kernel/libk/grdxt.c

@@ -165 +165 @@
     if( (key >> (w1 + w2 + w3)) != 0 )
     {
-        assert( false , __FUNCTION__ ,
+        assert( false ,
         "key value %x exceed (%d + %d + %d) bits", key , w1 , w2 , w3 );
     }
@@ -237 +237 @@
     if( (key >> (w1 + w2 + w3)) != 0 )
     {
-        assert( false , __FUNCTION__ ,
+        assert( false ,
         "key value %x exceed (%d + %d + %d) bits", key , w1 , w2 , w3 );
     }
@@ -279 +279 @@
     if( (key >> (w1 + w2 + w3)) != 0 )
     {
-        assert( false , __FUNCTION__ ,
+        assert( false ,
         "key value %x exceed (%d + %d + %d) bits", key , w1 , w2 , w3 );
     }
@@ -322 +322 @@
     if( (start_key >> (w1 + w2 + w3)) != 0 )
     {
-        assert( false , __FUNCTION__ ,
+        assert( false ,
         "start_key value %x exceed (%d + %d + %d) bits", start_key , w1 , w2 , w3 );
     }

trunk/kernel/libk/htab.c

@@ -99 +99 @@
     else
     {
-        assert( false , __FUNCTION__ , "undefined item type\n" );
+        assert( false , "undefined item type\n" );
     }
 

trunk/kernel/libk/xhtab.c

@@ -139 +139 @@
     else
     {
-        assert( false , __FUNCTION__ , "illegal item type\n" );
+        assert( false , "illegal item type\n" );
     }