Changeset 7ece4247 in mainline

Timestamp:

2011-08-26T23:36:00Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0be611b

Parents:

4bf6895

Message:

Cleanup.

Location:

uspace/srv/fs/fat

Files:

• fat_fat.c (modified) (7 diffs)
• fat_fat.h (modified) (1 diff)
• fat_ops.c (modified) (9 diffs)

uspace/srv/fs/fat/fat_fat.c

@@ -289 +289 @@
  * @return              EOK or a negative error code.
  */
-int
+static int
 fat_get_cluster_fat12(fat_bs_t *bs, service_id_t service_id, unsigned fatno,
     fat_cluster_t clst, fat_cluster_t *value)
@@ -359 +359 @@
  * @return              EOK or a negative error code.
  */
-int
+static int
 fat_get_cluster_fat16(fat_bs_t *bs, service_id_t service_id, unsigned fatno,
     fat_cluster_t clst, fat_cluster_t *value)
@@ -390 +390 @@
  * @return              EOK or a negative error code.
  */
-int
+static int
 fat_get_cluster_fat32(fat_bs_t *bs, service_id_t service_id, unsigned fatno,
     fat_cluster_t clst, fat_cluster_t *value)
@@ -451 +451 @@
  * @return              EOK on success or a negative error code.
  */
-int
+static int
 fat_set_cluster_fat12(fat_bs_t *bs, service_id_t service_id, unsigned fatno,
     fat_cluster_t clst, fat_cluster_t value)
@@ -494 +494 @@
                         return ERANGE;
                 }
-        }
-        else
+        } else
                 byte2 = ((uint8_t*) b->data)[(offset % BPS(bs)) + 1];
 
@@ -540 +539 @@
  * @return              EOK on success or a negative error code.
  */
-int
+static int
 fat_set_cluster_fat16(fat_bs_t *bs, service_id_t service_id, unsigned fatno,
     fat_cluster_t clst, fat_cluster_t value)
@@ -573 +572 @@
  * @return              EOK on success or a negative error code.
  */
-int
+static int
 fat_set_cluster_fat32(fat_bs_t *bs, service_id_t service_id, unsigned fatno,
     fat_cluster_t clst, fat_cluster_t value)

uspace/srv/fs/fat/fat_fat.h

@@ -125 +125 @@
 extern int fat_alloc_shadow_clusters(struct fat_bs *, service_id_t,
     fat_cluster_t *, unsigned);
-extern int fat_get_cluster_fat12(struct fat_bs *, service_id_t, unsigned,
-    fat_cluster_t, fat_cluster_t *);
-extern int fat_get_cluster_fat16(struct fat_bs *, service_id_t, unsigned,
-    fat_cluster_t, fat_cluster_t *);
-extern int fat_get_cluster_fat32(struct fat_bs *, service_id_t, unsigned,
-    fat_cluster_t, fat_cluster_t *);
 extern int fat_get_cluster(struct fat_bs *, service_id_t, unsigned,
     fat_cluster_t, fat_cluster_t *);
-extern int fat_set_cluster_fat12(struct fat_bs *, service_id_t, unsigned,
-    fat_cluster_t, fat_cluster_t);
-extern int fat_set_cluster_fat16(struct fat_bs *, service_id_t, unsigned,
-    fat_cluster_t, fat_cluster_t);
-extern int fat_set_cluster_fat32(struct fat_bs *, service_id_t, unsigned,
-    fat_cluster_t, fat_cluster_t);
 extern int fat_set_cluster(struct fat_bs *, service_id_t, unsigned,
     fat_cluster_t, fat_cluster_t);

uspace/srv/fs/fat/fat_ops.c

@@ -315 +315 @@
                 nodep->firstc = uint16_t_le2host(d->firstc_lo) | 
                     (uint16_t_le2host(d->firstc_hi) << 16);
-        } 
-        else
+        } else
                 nodep->firstc = uint16_t_le2host(d->firstc);
 
@@ -333 +332 @@
                  */
                 uint32_t clusters;
-                rc = fat_clusters_get(&clusters, bs, idxp->service_id, nodep->firstc);
+                rc = fat_clusters_get(&clusters, bs, idxp->service_id,
+                    nodep->firstc);
                 if (rc != EOK) {
                         (void) block_put(b);
@@ -392 +392 @@
                         /* hit */
                         fat_node_t *nodep;
-                        aoff64_t o = di.pos % (BPS(di.bs) / sizeof(fat_dentry_t));
+                        aoff64_t o = di.pos %
+                            (BPS(di.bs) / sizeof(fat_dentry_t));
                         fat_idx_t *idx = fat_idx_get_by_pos(service_id,
-                                parentp->firstc, di.bnum * DPS(di.bs) + o);
+                            parentp->firstc, di.bnum * DPS(di.bs) + o);
                         if (!idx) {
                                 /*
@@ -615 +616 @@
 
         rc = fat_directory_write(&di, name, &de);
-        if (rc!=EOK)
+        if (rc != EOK)
                 return rc;
         rc = fat_directory_close(&di);
-        if (rc!=EOK)
+        if (rc != EOK)
                 return rc;
 
@@ -713 +714 @@
         
         fat_directory_t di;
-        rc = fat_directory_open(parentp,&di);
+        rc = fat_directory_open(parentp, &di);
         if (rc != EOK)
                 goto error;
@@ -1089 +1090 @@
                 fat_directory_t di;
                 rc = fat_directory_open(nodep, &di);
-                if (rc != EOK) goto err;
+                if (rc != EOK)
+                        goto err;
                 rc = fat_directory_seek(&di, pos);
                 if (rc != EOK) {
@@ -1097 +1099 @@
 
                 rc = fat_directory_read(&di, name, &d);
-                if (rc == EOK) goto hit;
-                if (rc == ENOENT) goto miss;
+                if (rc == EOK)
+                        goto hit;
+                if (rc == ENOENT)
+                        goto miss;
 
 err:
@@ -1107 +1111 @@
 miss:
                 rc = fat_directory_close(&di);
-                if (rc!=EOK)
+                if (rc != EOK)
                         goto err;
                 rc = fat_node_put(fn);
@@ -1117 +1121 @@
                 pos = di.pos;
                 rc = fat_directory_close(&di);
-                if (rc!=EOK)
+                if (rc != EOK)
                         goto err;
-                (void) async_data_read_finalize(callid, name, str_size(name) + 1);
-                bytes = (pos - spos)+1;
+                (void) async_data_read_finalize(callid, name,
+                    str_size(name) + 1);
+                bytes = (pos - spos) + 1;
         }