Changeset 5a6cc679 in mainline for uspace/lib/ext4/src/superblock.c

Timestamp:

2018-01-31T02:21:24Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

File:

• uspace/lib/ext4/src/superblock.c (modified) (4 diffs)

uspace/lib/ext4/src/superblock.c

@@ -1127 +1127 @@
  *
  */
-int ext4_superblock_read_direct(service_id_t service_id, ext4_superblock_t **sb)
+errno_t ext4_superblock_read_direct(service_id_t service_id, ext4_superblock_t **sb)
 {
         /* Allocated memory for superblock structure */
@@ -1135 +1135 @@
         
         /* Read data from block device */
-        int rc = block_read_bytes_direct(service_id, EXT4_SUPERBLOCK_OFFSET,
+        errno_t rc = block_read_bytes_direct(service_id, EXT4_SUPERBLOCK_OFFSET,
             EXT4_SUPERBLOCK_SIZE, data);
         
@@ -1157 +1157 @@
  *
  */
-int ext4_superblock_write_direct(service_id_t service_id, ext4_superblock_t *sb)
+errno_t ext4_superblock_write_direct(service_id_t service_id, ext4_superblock_t *sb)
 {
         /* Load physical block size from block device */
         size_t phys_block_size;
-        int rc = block_get_bsize(service_id, &phys_block_size);
+        errno_t rc = block_get_bsize(service_id, &phys_block_size);
         if (rc != EOK)
                 return rc;
@@ -1199 +1199 @@
  *
  */
-int ext4_superblock_check_sanity(ext4_superblock_t *sb)
+errno_t ext4_superblock_check_sanity(ext4_superblock_t *sb)
 {
         if (ext4_superblock_get_magic(sb) != EXT4_SUPERBLOCK_MAGIC)