Changeset 488f7ed in mainline for uspace/srv/fs/minixfs/mfs_ops.c

Timestamp:

2011-04-16T11:47:52Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

6fc5262

Parents:

afd9c3b

Message:

read_directory_entry() should return an error code, not a poniter to the directory structure

File:

• uspace/srv/fs/minixfs/mfs_ops.c (modified) (5 diffs)

uspace/srv/fs/minixfs/mfs_ops.c

@@ -336 +336 @@
         struct mfs_ino_info *ino_i = mnode->ino_i;
         struct mfs_dentry_info *d_info;
+        int r;
 
         mfsdebug("mfs_match()\n");
@@ -347 +348 @@
         int i = 2;
         while (1) {
-                d_info = read_directory_entry(mnode, i++);
+                r = read_directory_entry(mnode, &d_info, i++);
+                if (r != EOK)
+                        return r;
+
                 if (!d_info) {
                         /*Reached the end of the directory entry list*/
@@ -535 +539 @@
 {
         struct mfs_node *mnode = fsnode->data;
+        int r;
 
         *has_children = false;
@@ -546 +551 @@
         int i = 2;
         while (1) {
-                d_info = read_directory_entry(mnode, i++);
+                r = read_directory_entry(mnode, &d_info, i++);
+                if (r != EOK)
+                        return r;
 
                 if (!d_info) {
@@ -612 +619 @@
 
                 while (1) {
-                        d_info = read_directory_entry(mnode, pos);
+                        rc = read_directory_entry(mnode, &d_info, pos);
+                        if (rc != EOK)
+                                goto out_error;
+
                         if (!d_info) {
                                 /*Reached the end of the dentries list*/