Changeset 492 for trunk/kernel/fs/devfs.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/fs/devfs.c (modified) (4 diffs)

trunk/kernel/fs/devfs.c

@@ -108 +108 @@
                                      devfs_dev_inode_xp ); 
 
-    assert( (error == 0) , __FUNCTION__ , "cannot create <dev>\n" );
+    assert( (error == 0) , "cannot create <dev>\n" );
 
 #if( DEBUG_DEVFS_INIT & 1 )
@@ -124 +124 @@
                                      devfs_external_inode_xp ); 
 
-    assert( (error == 0) , __FUNCTION__ , "cannot create <external>\n" );
+    assert( (error == 0) , "cannot create <external>\n" );
 
 #if DEBUG_DEVFS_INIT
@@ -372 +372 @@
                      uint32_t   size )
 {
-    assert( ( file_xp != XPTR_NULL ) , __FUNCTION__ , "file_xp == XPTR_NULL" );
-
-    assert( ( size < CONFIG_TXT_KBUF_SIZE ) , __FUNCTION__ , "string size too large" );
+    assert( ( file_xp != XPTR_NULL ) , "file_xp == XPTR_NULL" );
+
+    assert( ( size < CONFIG_TXT_KBUF_SIZE ) , "string size too large" );
 
     xptr_t             chdev_xp;
@@ -471 +471 @@
     else
     {
-        assert( false , __FUNCTION__ ,
+        assert( false ,
         "%s does not support direct user access", chdev_func_str(func) );