Changeset cfac897 in mainline

Timestamp:

2011-04-21T19:26:34Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

48de019

Parents:

adddd75

Message:

Use the on_error() macro where appropriated

Location:

uspace/srv/fs/minixfs

Files:

• mfs_inode.c (modified) (5 diffs)
• mfs_ops.c (modified) (13 diffs)

uspace/srv/fs/minixfs/mfs_inode.c

@@ -234 +234 @@
                                 BLOCK_FLAGS_NONE);
 
-        if (r != EOK)
-                goto out;
+        on_error(r, goto out);
 
         struct mfs_inode *ino = b->data;
@@ -277 +276 @@
                                 BLOCK_FLAGS_NONE);
 
-        if (r != EOK)
-                goto out;
+        on_error(r, goto out);
 
         struct mfs2_inode *ino2 = b->data;
@@ -338 +336 @@
 
                 r = mfs_alloc_bit(mnode->instance, &new_zone, BMAP_ZONE);
-                if (r != EOK)
-                        return r;
+                on_error(r, return r);
 
                 mfsdebug("write_map = %d\n", (int) ((start_zone + i) * bs));
@@ -346 +343 @@
                 r = block_get(&b, mnode->instance->handle, new_zone,
                                                 BLOCK_FLAGS_NOREAD);
-                if (r != EOK)
-                        return r;
+                on_error(r, return r);
 
                 memset(b->data, 0, bs);
@@ -355 +351 @@
                 r = write_map(mnode, (start_zone + i) * bs,
                                 new_zone, &dummy);
-                if (r != EOK)
-                        return r;
+
+                on_error(r, return r);
 
                 ino_i->i_size += bs;

uspace/srv/fs/minixfs/mfs_ops.c

@@ -265 +265 @@
 
         r = mfs_instance_get(handle, &inst);
-        if (r != EOK)
-                return r;
+        on_error(r, return r);
 
         if (flags & L_DIRECTORY) {
@@ -275 +274 @@
         /*Alloc a new inode*/
         r = mfs_alloc_bit(inst, &inum, BMAP_INODE);
-        if (r != EOK)
-                return r;
+        on_error(r, return r);
 
         struct mfs_ino_info *ino_i;
@@ -318 +316 @@
 
         r = put_inode(mnode);
-        if (r != EOK)
-                goto out_err_2;
+        on_error(r, goto out_err_2);
 
         fs_node_initialize(fsnode);
@@ -353 +350 @@
         while (1) {
                 r = read_directory_entry(mnode, &d_info, i++);
-                if (r != EOK)
-                        return r;
+                on_error(r, return r);
 
                 if (!d_info) {
@@ -395 +391 @@
 void mfs_stat(ipc_callid_t rid, ipc_call_t *request)
 {
-        mfsdebug("mfs_stat()\n");
         libfs_stat(&mfs_libfs_ops, mfs_reg.fs_handle, rid, request);
 }
@@ -406 +401 @@
 
         rc = mfs_instance_get(devmap_handle, &instance);
-
-        if (rc != EOK)
-                return rc;
+        on_error(rc, return rc);
 
         return mfs_node_core_get(rfn, instance, index);
@@ -477 +470 @@
 
         rc = get_inode(inst, &ino_i, index);
-        if (rc != EOK)
-                goto out_err;
+        on_error(rc, goto out_err);
 
         ino_i->index = index;
@@ -557 +549 @@
         while (1) {
                 r = read_directory_entry(mnode, &d_info, i++);
-                if (r != EOK)
-                        return r;
+                on_error(r, return r);
 
                 if (!d_info) {
@@ -627 +618 @@
                 while (1) {
                         rc = read_directory_entry(mnode, &d_info, pos);
-                        if (rc != EOK)
-                                goto out_error;
+                        on_error(rc, goto out_error);
 
                         if (!d_info) {
@@ -670 +660 @@
 
                 rc = read_map(&zone, mnode, pos);
-                if (rc != EOK)
-                        goto out_error;
+                on_error(rc, goto out_error);
 
                 if (zone == 0) {
@@ -688 +677 @@
 
                 rc = block_get(&b, handle, zone, BLOCK_FLAGS_NONE);
-                if (rc != EOK)
-                        goto out_error;
+                on_error(rc, goto out_error);
 
                 async_data_read_finalize(callid, b->data +
@@ -738 +726 @@
                                 mfs_version_t *version, bool *longfilenames)
 {
-        bool rc = false;
+        bool rc = true;
         *longfilenames = false;
 
@@ -744 +732 @@
                 *native = magic == MFS_MAGIC_V1;
                 *version = MFS_VERSION_V1;
-                rc = true;
         } else if (magic == MFS_MAGIC_V1L || magic == MFS_MAGIC_V1LR) {
                 *native = magic == MFS_MAGIC_V1L;
                 *version = MFS_VERSION_V1;
                 *longfilenames = true;
-                rc = true;
         } else if (magic == MFS_MAGIC_V2 || magic == MFS_MAGIC_V2R) {
                 *native = magic == MFS_MAGIC_V2;
                 *version = MFS_VERSION_V2;
-                rc = true;
         } else if (magic == MFS_MAGIC_V2L || magic == MFS_MAGIC_V2LR) {
                 *native = magic == MFS_MAGIC_V2L;
                 *version = MFS_VERSION_V2;
                 *longfilenames = true;
-                rc = true;
         } else if (magic == MFS_MAGIC_V3 || magic == MFS_MAGIC_V3R) {
                 *native = magic == MFS_MAGIC_V3;
                 *version = MFS_VERSION_V3;
-                rc = true;
-        }
+        } else
+                rc = false;
 
         return rc;