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

Timestamp:

2013-07-29T15:15:49Z (12 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/fat/fat_ops.c (modified) (4 diffs)

uspace/srv/fs/fat/fat_ops.c

@@ -91 +91 @@
 static bool fat_is_file(fs_node_t *node);
 static service_id_t fat_service_get(fs_node_t *node);
-static uint32_t fat_size_block(service_id_t);
-static uint64_t fat_total_block_count(service_id_t);
-static uint64_t fat_free_block_count(service_id_t);
+static int fat_size_block(service_id_t, uint32_t *);
+static int fat_total_block_count(service_id_t, uint64_t *);
+static int fat_free_block_count(service_id_t, uint64_t *);
 
 /*
@@ -846 +846 @@
 }
 
-uint32_t fat_size_block(service_id_t service_id)
+int fat_size_block(service_id_t service_id, uint32_t *size)
 {
         fat_bs_t *bs;
+
         bs = block_bb_get(service_id);
-
-        return BPC(bs);
-}
-
-uint64_t fat_total_block_count(service_id_t service_id)
+        *size = BPC(bs);
+
+        return EOK;
+}
+
+int fat_total_block_count(service_id_t service_id, uint64_t *count)
 {
         fat_bs_t *bs;
+        
         bs = block_bb_get(service_id);
-
-        uint64_t block_count = (SPC(bs)) ? TS(bs) / SPC(bs) : 0;
-
-        return block_count;
-}
-
-uint64_t fat_free_block_count(service_id_t service_id)
+        *count = (SPC(bs)) ? TS(bs) / SPC(bs) : 0;
+
+        return EOK;
+}
+
+int fat_free_block_count(service_id_t service_id, uint64_t *count)
 {
         fat_bs_t *bs;
@@ -874 +876 @@
         block_count = 0;
         bs = block_bb_get(service_id);
-        
         clusters = (SPC(bs)) ? TS(bs) / SPC(bs) : 0;
-        
         for (cluster_no = 0; cluster_no < clusters; cluster_no++) {
                 rc = fat_get_cluster(bs, service_id, FAT1, cluster_no, &e0);
@@ -885 +885 @@
                         block_count++;
         }
-
-        return block_count;
+        *count = block_count;
+        
+        return EOK;
 }