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

trunk/kernel/kern/chdev.c

@@ -264 +264 @@
 
     // deschedule
-    assert( thread_can_yield( this ) , __FUNCTION__ , "illegal sched_yield\n" );
+    assert( thread_can_yield( this ) , "illegal sched_yield\n" );
     sched_yield("blocked on I/O");
 
@@ -327 +327 @@
 
             // deschedule
-            assert( thread_can_yield( server ) , __FUNCTION__ , "illegal sched_yield\n" );
+            assert( thread_can_yield( server ) , "illegal sched_yield\n" );
             sched_yield("I/O queue empty");
         } 
@@ -408 +408 @@
     chdev_t     * chdev_ptr;
 
-    assert( (file_xp != XPTR_NULL) , __FUNCTION__,
+    assert( (file_xp != XPTR_NULL) ,
     "file_xp == XPTR_NULL\n" );
 
@@ -420 +420 @@
     inode_ptr  = (vfs_inode_t *)hal_remote_lpt( XPTR( file_cxy , &file_ptr->inode ) );
 
-    assert( (inode_type == INODE_TYPE_DEV) , __FUNCTION__ ,
+    assert( (inode_type == INODE_TYPE_DEV) ,
     "inode type %d is not INODE_TYPE_DEV\n", inode_type );