Changeset 492 for trunk/kernel/devices/dev_fbf.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/devices/dev_fbf.c (modified) (6 diffs)

trunk/kernel/devices/dev_fbf.c

@@ -59 +59 @@
     else
     {
-        assert( false , __FUNCTION__ , "undefined FBF device implementation" );
+        assert( false , "undefined FBF device implementation" );
     }
 
@@ -71 +71 @@
     xptr_t  dev_xp = chdev_dir.fbf[0];
 
-    assert( (dev_xp != XPTR_NULL) , __FUNCTION__ , "undefined FBF chdev descriptor" );
+    assert( (dev_xp != XPTR_NULL) , "undefined FBF chdev descriptor" );
 
     // get FBF chdev cluster and local pointer
@@ -89 +89 @@
     xptr_t  dev_xp = chdev_dir.fbf[0];
 
-    assert( (dev_xp != XPTR_NULL) , __FUNCTION__ , "undefined FBF chdev descriptor" );
+    assert( (dev_xp != XPTR_NULL) , "undefined FBF chdev descriptor" );
 
     // get FBF chdev cluster and local pointer
@@ -106 +106 @@
     xptr_t  dev_xp = chdev_dir.fbf[0];
 
-    assert( (dev_xp != XPTR_NULL) , __FUNCTION__ , "undefined FBF chdev descriptor" );
+    assert( (dev_xp != XPTR_NULL) , "undefined FBF chdev descriptor" );
 
     // get FBF chdev cluster and local pointer
@@ -132 +132 @@
     xptr_t  fbf_xp = chdev_dir.fbf[0];
 
-    assert( (fbf_xp != XPTR_NULL) , __FUNCTION__ , "undefined FBF chdev descriptor" );
+    assert( (fbf_xp != XPTR_NULL) , "undefined FBF chdev descriptor" );
 
     // get FBF chdev cluster and local pointer
@@ -144 +144 @@
 
     // check offset and length versus FBF size
-    assert( ((offset + length) <= (width * height)) , __FUNCTION__ ,
+    assert( ((offset + length) <= (width * height)) ,
     "offset %d / length %d / width %d / height %d\n", offset, length, width, height );