Changeset 132ab5d1 in mainline for uspace/srv/fs/cdfs/cdfs_ops.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

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

uspace/srv/fs/cdfs/cdfs_ops.c

@@ -42 +42 @@
 #include <adt/hash_table.h>
 #include <adt/hash.h>
-#include <malloc.h>
 #include <mem.h>
 #include <loc.h>
@@ -49 +48 @@
 #include <block.h>
 #include <scsi/mmc.h>
+#include <stdlib.h>
 #include <str.h>
 #include <byteorder.h>
@@ -566 +566 @@
 }
 
-static bool cdfs_readdir(cdfs_t *fs, fs_node_t *fs_node)
+static int cdfs_readdir(cdfs_t *fs, fs_node_t *fs_node)
 {
         cdfs_node_t *node = CDFS_NODE(fs_node);
@@ -572 +572 @@
         
         if (node->processed)
-                return true;
+                return EOK;
         
         uint32_t blocks = node->size / BLOCK_SIZE;
@@ -582 +582 @@
                 int rc = block_get(&block, fs->service_id, node->lba + i, BLOCK_FLAGS_NONE);
                 if (rc != EOK)
-                        return false;
+                        return rc;
                 
                 cdfs_dir_t *dir;
@@ -616 +616 @@
                         int rc = create_node(&fn, fs, dentry_type,
                             (node->lba + i) * BLOCK_SIZE + offset);
-                        if ((rc != EOK) || (fn == NULL))
-                                return false;
+                        if (rc != EOK)
+                                return rc;
+
+                        assert(fn != NULL);
                         
                         cdfs_node_t *cur = CDFS_NODE(fn);
@@ -626 +628 @@
                             dir->name_length, node->fs->enc, dentry_type);
                         if (name == NULL)
-                                return false;
+                                return EIO;
                         
                         // FIXME: check return value
@@ -641 +643 @@
         
         node->processed = true;
-        return true;
+        return EOK;
 }
 
@@ -961 +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)
 {
@@ -968 +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;
@@ -980 +982 @@
             (vol_desc->version != 1)) {
                 block_put(block);
-                return false;
+                return ENOTSUP;
         }
         
@@ -1000 +1002 @@
                  */
                 block_put(block);
-                return false;
+                return ENOTSUP;
         }
         
@@ -1006 +1008 @@
         if (block_size != BLOCK_SIZE) {
                 block_put(block);
-                return false;
+                return ENOTSUP;
         }
         
@@ -1031 +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);
@@ -1072 +1075 @@
         
         /* Check if there is cdfs in given session */
-        if (!iso_readfs(fs, rfn, altroot))
+        if (iso_readfs(fs, rfn, altroot) != EOK)
                 goto error;
         
@@ -1125 +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;
         }