Changeset 3dd148d in mainline for uspace/srv/fs/exfat/exfat_ops.c

Timestamp:

2013-07-29T15:15:49Z (11 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

736b07b

Parents:

a1c95da

Message:

Change stafs function operation to allow correct error handling.

File:

• uspace/srv/fs/exfat/exfat_ops.c (modified) (4 diffs)

uspace/srv/fs/exfat/exfat_ops.c

@@ -89 +89 @@
 static bool exfat_is_file(fs_node_t *node);
 static service_id_t exfat_service_get(fs_node_t *node);
-static uint32_t exfat_size_block(service_id_t);
-static uint64_t exfat_total_block_count(service_id_t);
-static uint64_t exfat_free_block_count(service_id_t);
+static int exfat_size_block(service_id_t, uint32_t *);
+static int exfat_total_block_count(service_id_t, uint64_t *);
+static int exfat_free_block_count(service_id_t, uint64_t *);
 
 /*
@@ -915 +915 @@
 }
 
-uint32_t exfat_size_block(service_id_t service_id)
+int exfat_size_block(service_id_t service_id, uint32_t *size)
 {
         exfat_bs_t *bs;
         bs = block_bb_get(service_id);
-        
-        return BPC(bs);
-}
-
-uint64_t exfat_total_block_count(service_id_t service_id)
+        *size = BPC(bs);
+
+        return EOK;
+}
+
+int exfat_total_block_count(service_id_t service_id, uint64_t *count)
 {
         exfat_bs_t *bs;
         bs = block_bb_get(service_id);
+        *count = DATA_CNT(bs);
         
-        uint64_t block_count = DATA_CNT(bs);
-        
-        return block_count;
-}
-
-uint64_t exfat_free_block_count(service_id_t service_id)
+        return EOK;
+}
+
+int exfat_free_block_count(service_id_t service_id, uint64_t *count)
 {
         fs_node_t *node;
@@ -943 +943 @@
         int rc;
 
-        block_count = exfat_total_block_count(service_id);
+        rc = exfat_total_block_count(service_id, &block_count);
+        if (rc != EOK)
+                goto exit;
 
         bs = block_bb_get(service_id);
@@ -985 +987 @@
 exit:
         exfat_node_put(node);
-        return free_block_count;
+        *count = free_block_count;
+        return rc;
 }