Changeset 0dbe5ac in mainline for uspace/srv/fs/exfat/exfat_fat.c

Timestamp:

2011-08-26T21:19:24Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5d95f02

Parents:

ff0c270

Message:

Cstyle.

File:

• uspace/srv/fs/exfat/exfat_fat.c (modified) (7 diffs)

uspace/srv/fs/exfat/exfat_fat.c

@@ -135 +135 @@
         if (nodep->fragmented) {
                 if (((((nodep->size - 1) / BPS(bs)) / SPC(bs)) == bn / SPC(bs)) &&
-                        nodep->lastc_cached_valid) {
-                                /*
-                        * This is a request to read a block within the last cluster
-                        * when fortunately we have the last cluster number cached.
-                        */
+                    nodep->lastc_cached_valid) {
+                        /*
+                         * This is a request to read a block within the last cluster
+                         * when fortunately we have the last cluster number cached.
+                         */
                         return block_get(block, nodep->idx->service_id, DATA_FS(bs) + 
                         (nodep->lastc_cached_value-EXFAT_CLST_FIRST)*SPC(bs) + 
@@ -195 +195 @@
         int rc;
 
-        if (fcl < EXFAT_CLST_FIRST || fcl > DATA_CNT(bs)+2)
+        if (fcl < EXFAT_CLST_FIRST || fcl > DATA_CNT(bs) + 2)
                 return ELIMIT;
 
         if (!fragmented) {
                 rc = block_get(block, service_id, DATA_FS(bs) + 
-                    (fcl-EXFAT_CLST_FIRST)*SPC(bs) + bn, flags);
+                    (fcl - EXFAT_CLST_FIRST)*SPC(bs) + bn, flags);
         } else {
                 max_clusters = bn / SPC(bs);
@@ -209 +209 @@
 
                 rc = block_get(block, service_id, DATA_FS(bs) + 
-                    (c-EXFAT_CLST_FIRST)*SPC(bs) + (bn % SPC(bs)), flags);
+                    (c - EXFAT_CLST_FIRST) * SPC(bs) + (bn % SPC(bs)), flags);
 
                 if (clp)
@@ -310 +310 @@
 
         fibril_mutex_lock(&exfat_alloc_lock);
-        for (clst=EXFAT_CLST_FIRST; clst < DATA_CNT(bs)+2 && found < nclsts; clst++) {
+        for (clst = EXFAT_CLST_FIRST; clst < DATA_CNT(bs) + 2 && found < nclsts;
+            clst++) {
                 /* Need to rewrite because of multiple exfat_bitmap_get calls */
-                if (bitmap_is_free(bs, service_id, clst)==EOK) {
-                   /*
-                        * The cluster is free. Put it into our stack
-                        * of found clusters and mark it as non-free.
-                        */
+                if (bitmap_is_free(bs, service_id, clst) == EOK) {
+                        /*
+                         * The cluster is free. Put it into our stack
+                         * of found clusters and mark it as non-free.
+                         */
                         lifo[found] = clst;
                         rc = exfat_set_cluster(bs, service_id, clst,
-                                (found == 0) ?  EXFAT_CLST_EOF : lifo[found - 1]);
+                            (found == 0) ?  EXFAT_CLST_EOF : lifo[found - 1]);
                         if (rc != EOK)
                                 break;
@@ -339 +340 @@
 
         /* If something wrong - free the clusters */
-        if (found > 0) {
-                while (found--) {
-                        (void) bitmap_clear_cluster(bs, service_id, lifo[found]);
-                        (void) exfat_set_cluster(bs, service_id, lifo[found], 0);
-                }
+        while (found--) {
+                (void) bitmap_clear_cluster(bs, service_id, lifo[found]);
+                (void) exfat_set_cluster(bs, service_id, lifo[found], 0);
         }
 
@@ -490 +489 @@
 
         for (i = 0; i < SPC(bs); i++) {
-                rc = exfat_block_get_by_clst(&b, bs, service_id, false, c, NULL, i,
-                    BLOCK_FLAGS_NOREAD);
+                rc = exfat_block_get_by_clst(&b, bs, service_id, false, c, NULL,
+                    i, BLOCK_FLAGS_NOREAD);
                 if (rc != EOK)
                         return rc;
@@ -517 +516 @@
                 if (rc != EOK)
                         return rc;
-                if (i == blocks-1)
-                        count = nodep->size - i*BPS(bs);
+                if (i == blocks - 1)
+                        count = nodep->size - i * BPS(bs);
                 memcpy(uctable, b->data, count);
                 uctable += count;