Changeset 488f7ed in mainline

Timestamp:

2011-04-16T11:47:52Z (14 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

Location:

uspace/srv/fs/minixfs

Files:

• mfs.h (modified) (1 diff)
• mfs_dentry.c (modified) (6 diffs)
• mfs_ops.c (modified) (5 diffs)

uspace/srv/fs/minixfs/mfs.h

@@ -181 +181 @@
 
 /*mfs_dentry.c*/
-extern struct mfs_dentry_info *
-read_directory_entry(struct mfs_node *mnode, unsigned index);
+extern int
+read_directory_entry(struct mfs_node *mnode,
+                        struct mfs_dentry_info **d_info, unsigned index);
 
 extern int

uspace/srv/fs/minixfs/mfs_dentry.c

@@ -36 +36 @@
 #include "mfs_utils.h"
 
-struct mfs_dentry_info *
-read_directory_entry(struct mfs_node *mnode, unsigned index)
+int
+read_directory_entry(struct mfs_node *mnode,
+                        struct mfs_dentry_info **d_info, unsigned index)
 {
         const struct mfs_instance *inst = mnode->instance;
@@ -47 +48 @@
         mfsdebug("read_directory(%u)\n", index);
 
-        struct mfs_dentry_info *d_info = malloc(sizeof(*d_info));
-        if (!d_info)
-                return NULL;
+        *d_info = malloc(sizeof(**d_info));
+        if (!*d_info)
+                return ENOMEM;
 
         int r = read_map(&block, mnode, index * sbi->dirsize);
-        if (r != EOK || block == 0)
+        if (r != EOK)
                 goto out_err;
+
+        if (block == 0) {
+                r = EIO;
+                goto out_err;
+        }
 
         r = block_get(&b, inst->handle, block, BLOCK_FLAGS_NONE);
@@ -67 +73 @@
                 d3 = b->data + (dentry_off * MFS3_DIRSIZE);
 
-                d_info->d_inum = conv32(sbi->native, d3->d_inum);
-                memcpy(d_info->d_name, d3->d_name, MFS3_MAX_NAME_LEN);
+                (*d_info)->d_inum = conv32(sbi->native, d3->d_inum);
+                memcpy((*d_info)->d_name, d3->d_name, MFS3_MAX_NAME_LEN);
         } else {
                 const int namelen = longnames ? MFS_L_MAX_NAME_LEN :
@@ -77 +83 @@
                 d = b->data + dentry_off * (longnames ? MFSL_DIRSIZE :
                                                         MFS_DIRSIZE);
-                d_info->d_inum = conv16(sbi->native, d->d_inum);
-                memcpy(d_info->d_name, d->d_name, namelen);
+                (*d_info)->d_inum = conv16(sbi->native, d->d_inum);
+                memcpy((*d_info)->d_name, d->d_name, namelen);
         }
 
         block_put(b);
 
-        d_info->index = index;
-        d_info->node = mnode;
-        return d_info;
+        (*d_info)->index = index;
+        (*d_info)->node = mnode;
+        return EOK;
 
 out_err:
-        free(d_info);
-        return NULL;
+        free(*d_info);
+        *d_info = NULL;
+        return r;
 }
 
@@ -151 +158 @@
 
         for (i = 2; ; ++i) {
-                d_info = read_directory_entry(mnode, i);
+                r = read_directory_entry(mnode, &d_info, i);
+                if (r != EOK)
+                        return r;
 
                 if (!d_info) {
@@ -171 +180 @@
                         return r;
 
-                d_info = read_directory_entry(mnode, i);
-                if (!d_info)
-                        return EIO;
+                r = read_directory_entry(mnode, &d_info, i);
+                if (r != EOK)
+                        return r;
         }
 

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*/