Changeset a8c7a6d in mainline

Timestamp:

2017-12-08T21:03:35Z (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:

fed5a9b

Parents:

6ad454f

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-08 06:17:36)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-08 21:03:35)

Message:

Let cdfs_readdir() return error code rather than bool.

File:

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

uspace/srv/fs/cdfs/cdfs_ops.c

@@ -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;
 }