Changeset 94e3a03 in mainline

Timestamp:

2017-12-09T21:15:26Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

c81132d

Parents:

bd253241

Message:

Fix bool error returns in cdfs.

Turns out pointers are assignable to bool without warning. Who know?
Also, horrible practice.

File:

• uspace/srv/fs/cdfs/cdfs_ops.c (modified) (8 diffs)

uspace/srv/fs/cdfs/cdfs_ops.c

@@ -963 +963 @@
 
 /** Read the volume descriptors. */
-static bool iso_read_vol_desc(service_id_t sid, cdfs_lba_t altroot,
+static int iso_read_vol_desc(service_id_t sid, cdfs_lba_t altroot,
     uint32_t *rlba, uint32_t *rsize, cdfs_enc_t *enc, char **vol_ident)
 {
@@ -970 +970 @@
         int rc = block_get(&block, sid, altroot + 16, BLOCK_FLAGS_NONE);
         if (rc != EOK)
-                return false;
+                return rc;
         
         cdfs_vol_desc_t *vol_desc = (cdfs_vol_desc_t *) block->data;
@@ -982 +982 @@
             (vol_desc->version != 1)) {
                 block_put(block);
-                return false;
+                return ENOTSUP;
         }
         
@@ -1002 +1002 @@
                  */
                 block_put(block);
-                return false;
+                return ENOTSUP;
         }
         
@@ -1008 +1008 @@
         if (block_size != BLOCK_SIZE) {
                 block_put(block);
-                return false;
+                return ENOTSUP;
         }
         
@@ -1033 +1033 @@
         
         block_put(block);
-        return true;
-}
-
-static bool iso_readfs(cdfs_t *fs, fs_node_t *rfn,
+        return EOK;
+}
+
+static int iso_readfs(cdfs_t *fs, fs_node_t *rfn,
     cdfs_lba_t altroot)
 {
         cdfs_node_t *node = CDFS_NODE(rfn);
         
-        if (!iso_read_vol_desc(fs->service_id, altroot, &node->lba,
-            &node->size, &fs->enc, &fs->vol_ident))
-                return false;
+        int rc = iso_read_vol_desc(fs->service_id, altroot, &node->lba,
+            &node->size, &fs->enc, &fs->vol_ident);
+        if (rc != EOK)
+                return rc;
         
         return cdfs_readdir(fs, rfn);
@@ -1074 +1075 @@
         
         /* Check if there is cdfs in given session */
-        if (!iso_readfs(fs, rfn, altroot))
+        if (iso_readfs(fs, rfn, altroot) != EOK)
                 goto error;
         
@@ -1127 +1128 @@
         uint32_t rsize;
         cdfs_enc_t enc;
-        if (!iso_read_vol_desc(service_id, altroot, &rlba, &rsize, &enc,
-            &vol_ident)) {
+        rc = iso_read_vol_desc(service_id, altroot, &rlba, &rsize, &enc,
+            &vol_ident);
+        if (rc != EOK) {
                 block_cache_fini(service_id);
                 block_fini(service_id);
-                return EIO;
+                return rc;
         }