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

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/mfs

Files:

• mfs_dentry.c (modified) (1 diff)
• mfs_ops.c (modified) (5 diffs)

uspace/srv/fs/mfs/mfs_dentry.c

@@ -171 +171 @@
         /* Search the directory entry to be removed */
         unsigned i;
-        for (i = 0; i < mnode->ino_i->i_size / sbi->dirsize ; ++i) {
+        for (i = 0; i < mnode->ino_i->i_size / sbi->dirsize; ++i) {
                 r = mfs_read_dentry(mnode, &d_info, i);
                 if (r != EOK)

uspace/srv/fs/mfs/mfs_ops.c

@@ -103 +103 @@
 open_nodes_key_hash(void *key)
 {
-        node_key_t *node_key = (node_key_t*)key;
+        node_key_t *node_key = (node_key_t *)key;
         return hash_combine(node_key->service_id, node_key->index);
 }
@@ -117 +117 @@
 open_nodes_key_equal(void *key, const ht_link_t *item)
 {
-        node_key_t *node_key = (node_key_t*)key;
+        node_key_t *node_key = (node_key_t *)key;
         struct mfs_node *mnode = hash_table_get_inst(item, struct mfs_node, link);
 
-        return node_key->service_id == mnode->instance->service_id
-                && node_key->index == mnode->ino_i->index;
+        return node_key->service_id == mnode->instance->service_id &&
+            node_key->index == mnode->ino_i->index;
 }
 
@@ -361 +361 @@
         if (sbi)
                 free(sbi);
-        if(instance)
+        if (instance)
                 free(instance);
         return rc;
@@ -871 +871 @@
                 async_answer_0(chandle, rc != EOK ? rc : ENOENT);
                 return rc;
-found:
+        found:
                 async_data_read_finalize(chandle, d_info.d_name,
                     str_size(d_info.d_name) + 1);
@@ -1102 +1102 @@
 static bool
 check_magic_number(uint16_t magic, bool *native,
-                mfs_version_t *version, bool *longfilenames)
+    mfs_version_t *version, bool *longfilenames)
 {
         bool rc = true;