Changeset 18b6a88 in mainline for uspace/srv/fs/fat

Timestamp:

2018-04-15T09:35:04Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c1f44ca

Parents:

8ebe212

Message:

More ccheck fixes, sometimes with manual intervention.

Location:

uspace/srv/fs/fat

Files:

• fat_fat.c (modified) (4 diffs)
• fat_idx.c (modified) (6 diffs)
• fat_ops.c (modified) (3 diffs)

uspace/srv/fs/fat/fat_fat.c

@@ -249 +249 @@
         for (o = nodep->size; o < pos && o < boundary;
             o = ALIGN_DOWN(o + BPS(bs), BPS(bs))) {
-                int flags = (o % BPS(bs) == 0) ?
+                int flags = (o % BPS(bs) == 0) ?
                     BLOCK_FLAGS_NOREAD : BLOCK_FLAGS_NONE;
                 rc = fat_block_get(&b, bs, nodep, o / BPS(bs), flags);
@@ -324 +324 @@
                         * first byte of next sector
                         */
-                        byte2 = ((uint8_t*) b1->data)[0];
+                        byte2 = ((uint8_t *) b1->data)[0];
 
                         rc = block_put(b1);
@@ -469 +469 @@
                 return rc;
 
-        byte1 = ((uint8_t*) b->data)[offset % BPS(bs)];
+        byte1 = ((uint8_t *) b->data)[offset % BPS(bs)];
         bool border = false;
         /* This cluster access spans a sector boundary. */
@@ -495 +495 @@
                 }
         } else
-                byte2 = ((uint8_t*) b->data)[(offset % BPS(bs)) + 1];
+                byte2 = ((uint8_t *) b->data)[(offset % BPS(bs)) + 1];
 
         if (IS_ODD(clst)) {

uspace/srv/fs/fat/fat_idx.c

@@ -119 +119 @@
 static inline size_t pos_key_hash(void *key)
 {
-        pos_key_t *pos = (pos_key_t*)key;
+        pos_key_t *pos = (pos_key_t *)key;
 
         size_t hash = 0;
@@ -141 +141 @@
 static bool pos_key_equal(void *key, const ht_link_t *item)
 {
-        pos_key_t *pos = (pos_key_t*)key;
+        pos_key_t *pos = (pos_key_t *)key;
         fat_idx_t *fidx = hash_table_get_inst(item, fat_idx_t, uph_link);
 
-        return pos->service_id == fidx->service_id
-                && pos->pdi == fidx->pdi
-                && pos->pfc == fidx->pfc;
+        return pos->service_id == fidx->service_id &&
+            pos->pdi == fidx->pdi &&
+            pos->pfc == fidx->pfc;
 }
 
@@ -170 +170 @@
 static size_t idx_key_hash(void *key_arg)
 {
-        idx_key_t *key = (idx_key_t*)key_arg;
+        idx_key_t *key = (idx_key_t *)key_arg;
         return hash_combine(key->service_id, key->index);
 }
@@ -183 +183 @@
 {
         fat_idx_t *fidx = hash_table_get_inst(item, fat_idx_t, uih_link);
-        idx_key_t *key = (idx_key_t*)key_arg;
+        idx_key_t *key = (idx_key_t *)key_arg;
 
         return key->index == fidx->index && key->service_id == fidx->service_id;
@@ -508 +508 @@
 static bool rm_pos_service_id(ht_link_t *item, void *arg)
 {
-        service_id_t service_id = *(service_id_t*)arg;
+        service_id_t service_id = *(service_id_t *)arg;
         fat_idx_t *fidx = hash_table_get_inst(item, fat_idx_t, uph_link);
 
@@ -520 +520 @@
 static bool rm_idx_service_id(ht_link_t *item, void *arg)
 {
-        service_id_t service_id = *(service_id_t*)arg;
+        service_id_t service_id = *(service_id_t *)arg;
         fat_idx_t *fidx = hash_table_get_inst(item, fat_idx_t, uih_link);
 

uspace/srv/fs/fat/fat_ops.c

@@ -241 +241 @@
                 fn = FS_NODE(nodep);
         } else {
-skip_cache:
+        skip_cache:
                 /* Try to allocate a new node structure. */
                 fibril_mutex_unlock(&ffn_mutex);
@@ -1289 +1289 @@
                         goto miss;
 
-err:
+        err:
                 (void) fat_node_put(fn);
                 async_answer_0(chandle, rc);
                 return rc;
 
-miss:
+        miss:
                 rc = fat_directory_close(&di);
                 if (rc != EOK)
@@ -1303 +1303 @@
                 return rc != EOK ? rc : ENOENT;
 
-hit:
+        hit:
                 pos = di.pos;
                 rc = fat_directory_close(&di);