Changeset e402382 in mainline for uspace/srv/fs/fat/fat_ops.c

Timestamp:

2009-09-03T13:24:36Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

dc87ad11

Parents:

684b655

Message:

Make fat_cluster_walk() return an error code.

File:

• uspace/srv/fs/fat/fat_ops.c (modified) (3 diffs)

uspace/srv/fs/fat/fat_ops.c

@@ -220 +220 @@
                  * size of the directory by walking the FAT.
                  */
-                nodep->size = bps * spc * fat_clusters_get(bs, idxp->dev_handle,
+                uint16_t clusters;
+                rc = fat_clusters_get(&clusters, bs, idxp->dev_handle,
                     uint16_t_le2host(d->firstc));
+                assert(rc == EOK);
+                nodep->size = bps * spc * clusters;
         } else {
                 nodep->type = FAT_FILE;
@@ -1189 +1192 @@
                 } else {
                         fat_cluster_t lastc;
-                        (void) fat_cluster_walk(bs, dev_handle, nodep->firstc,
-                            &lastc, (size - 1) / bpc);
+                        rc = fat_cluster_walk(bs, dev_handle, nodep->firstc,
+                            &lastc, NULL, (size - 1) / bpc);
+                        if (rc != EOK)
+                                goto out;
                         fat_chop_clusters(bs, nodep, lastc);
                 }
@@ -1197 +1202 @@
                 rc = EOK;       
         }
+out:
         fat_node_put(fn);
         ipc_answer_0(rid, rc);