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

trunk/kernel/fs/fatfs.c

@@ -259 +259 @@
     uint32_t   next_cluster_id;        // content of current FAT slot
 
-    assert( (searched_page_index > 0) , __FUNCTION__ , 
+    assert( (searched_page_index > 0) ,
     "no FAT access required for first page\n");
 
@@ -352 +352 @@
 #endif
 
-    assert( (fatfs_ctx != NULL) , __FUNCTION__ ,
+    assert( (fatfs_ctx != NULL) ,
     "cannot allocate memory for FATFS context\n" );
 
@@ -360 +360 @@
         buffer      = (uint8_t *)kmem_alloc( &req );
 
-    assert( (buffer != NULL) , __FUNCTION__ ,
+    assert( (buffer != NULL) ,
     "cannot allocate memory for 512 bytes buffer\n" );
      
@@ -367 +367 @@
     error = dev_ioc_sync_read( buffer , 0 , 1 );
 
-    assert( (error == 0) , __FUNCTION__ , 
+    assert( (error == 0) ,
     "cannot access boot record\n" );
 
@@ -393 +393 @@
     uint32_t sector_size = fatfs_get_record( BPB_BYTSPERSEC , buffer , 1 );
 
-    assert( (sector_size == 512) , __FUNCTION__ ,
+    assert( (sector_size == 512) ,
             "sector size must be 512 bytes\n" );
 
@@ -399 +399 @@
     uint32_t nb_sectors = fatfs_get_record( BPB_SECPERCLUS , buffer , 1 );
 
-    assert( (nb_sectors == 8) , __FUNCTION__ ,
+    assert( (nb_sectors == 8) ,
     "cluster size must be 8 sectors\n" );
 
@@ -405 +405 @@
     uint32_t nb_fats = fatfs_get_record( BPB_NUMFATS , buffer , 1 );
 
-    assert( (nb_fats == 1) , __FUNCTION__ ,
+    assert( (nb_fats == 1) ,
     "number of FAT copies must be 1\n" );
 
@@ -411 +411 @@
     uint32_t fat_sectors = fatfs_get_record( BPB_FAT32_FATSZ32 , buffer , 1 );
 
-    assert( ((fat_sectors & 0xF) == 0) , __FUNCTION__ ,
+    assert( ((fat_sectors & 0xF) == 0) ,
     "FAT not multiple of 16 sectors\n");
 
@@ -417 +417 @@
     uint32_t root_cluster = fatfs_get_record( BPB_FAT32_ROOTCLUS , buffer , 1 );
 
-    assert( (root_cluster == 2) , __FUNCTION__ ,
+    assert( (root_cluster == 2) ,
     "root cluster index must be  2\n");
 
@@ -431 +431 @@
     mapper_t * fat_mapper = mapper_create( FS_TYPE_FATFS );
 
-    assert( (fat_mapper != NULL) , __FUNCTION__ ,
+    assert( (fat_mapper != NULL) ,
     "no memory for FAT mapper" );
 
@@ -632 +632 @@
     mapper_t * mapper = parent_inode->mapper;
 
-    assert( (mapper != NULL) , __FUNCTION__ , "parent mapper undefined\n");
+    assert( (mapper != NULL) , "parent mapper undefined\n");
     
     char       cname[CONFIG_VFS_MAX_NAME_LENGTH];  // name extracter from each directory entry
@@ -659 +659 @@
         page = mapper_get_page( mapper , index );
 
-        assert( (page != NULL) , __FUNCTION__ , "bad parent mapper\n");
+        assert( (page != NULL) , "bad parent mapper\n");
 
         // get page base