Changeset 492 for trunk/kernel/syscalls

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/syscalls

Files:

• sys_exec.c (modified) (2 diffs)
• sys_read.c (modified) (1 diff)
• sys_write.c (modified) (1 diff)

trunk/kernel/syscalls/sys_exec.c

@@ -174 +174 @@
     pid_t         pid     = process->pid;
 
-    assert( (CXY_FROM_PID( pid ) == local_cxy) , __FUNCTION__ ,
+    assert( (CXY_FROM_PID( pid ) == local_cxy) ,
     "must be called in the owner cluster\n");
 
-    assert( (LTID_FROM_TRDID( this->trdid ) == 0) , __FUNCTION__ ,
+    assert( (LTID_FROM_TRDID( this->trdid ) == 0) ,
     "must be called by the main thread\n");
 
-    assert( (args == NULL) , __FUNCTION__ , 
+    assert( (args == NULL) ,
     "args not supported yet\n" );
 
-    assert( (envs == NULL) , __FUNCTION__ , 
+    assert( (envs == NULL) ,
     "args not supported yet\n" );
 
@@ -252 +252 @@
     }
 
-    assert( false , __FUNCTION__, "we should not execute this code" );
+    assert( false , "we should not execute this code" );
 
     return 0;  

trunk/kernel/syscalls/sys_read.c

@@ -209 +209 @@
     {
         nbytes = 0;
-        assert( false , __FUNCTION__ , "file type %d non supported yet\n", type );
+        assert( false , "file type %d non supported yet\n", type );
     }
 

trunk/kernel/syscalls/sys_write.c

@@ -173 +173 @@
     {
         nbytes = 0;
-        assert( false , __FUNCTION__ , "file type %d non supported\n", type );
+        assert( false , "file type %d non supported\n", type );
     }