Changeset c699b0c in mainline for uspace/srv/fs/minixfs/mfs_dentry.c

Timestamp:

2011-09-04T13:12:33Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

3a5ee6c

Parents:

03bc76a

Message:

remove the on_error() macro

File:

• uspace/srv/fs/minixfs/mfs_dentry.c (modified) (7 diffs)

uspace/srv/fs/minixfs/mfs_dentry.c

@@ -53 +53 @@
 
         int r = read_map(&block, mnode, index * sbi->dirsize);
-        on_error(r, goto out_err);
+        if (r != EOK)
+                goto out_err;
 
         if (block == 0) {
@@ -62 +63 @@
 
         r = block_get(&b, inst->service_id, block, BLOCK_FLAGS_NONE);
-        on_error(r, goto out_err);
+        if (r != EOK)
+                goto out_err;
 
         unsigned dentries_per_zone = sbi->block_size / sbi->dirsize;
@@ -113 +115 @@
 
         r = read_map(&block, mnode, d_off_bytes);
-        on_error(r, goto out);
+        if (r != EOK)
+                goto out;
 
         r = block_get(&b, mnode->instance->service_id, block, BLOCK_FLAGS_NONE);
-        on_error(r, goto out);
+        if (r != EOK)
+                goto out;
 
         const size_t name_len = sbi->max_name_len;
@@ -166 +170 @@
         for (i = 0; i < mnode->ino_i->i_size / sbi->dirsize ; ++i) {
                 r = read_dentry(mnode, &d_info, i);
-                on_error(r, return r);
+                if (r != EOK)
+                        return r;
 
                 const size_t d_name_len = str_size(d_info.d_name);
@@ -206 +211 @@
         for (i = 0; i < mnode->ino_i->i_size / sbi->dirsize; ++i) {
                 r = read_dentry(mnode, &d_info, i);
-                on_error(r, return r);
+                if (r != EOK)
+                        return r;
 
                 if (d_info.d_inum == 0) {
@@ -219 +225 @@
                 pos = mnode->ino_i->i_size;
                 r = read_map(&b, mnode, pos);
-                on_error(r, goto out);
+                if (r != EOK)
+                        goto out;
 
                 if (b == 0) {
@@ -226 +233 @@
                         uint32_t dummy;
                         r = mfs_alloc_zone(mnode->instance, &b);
-                        on_error(r, goto out);
+                        if (r != EOK)
+                                goto out;
                         r = write_map(mnode, pos, b, &dummy);
-                        on_error(r, goto out);
+                        if (r != EOK)
+                                goto out;
                 }