Changeset 63bcbbc in mainline for uspace/srv/fs/exfat/exfat_directory.c

Timestamp:

2011-12-12T20:23:53Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1df224c

Parents:

bf84871 (diff), 80ec9b8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:exfat-helenos.

File:

• uspace/srv/fs/exfat/exfat_directory.c (modified) (5 diffs)

uspace/srv/fs/exfat/exfat_directory.c

@@ -112 +112 @@
                 rc = block_put(di->b);
                 di->b = NULL;
+                if (rc != EOK)
+                        return rc;
         }
         if (!di->b) {
@@ -266 +268 @@
                 if (idx == 2 || idx == 3)
                         continue;
-                checksum = ((checksum << 15) | (checksum >> 1)) + (uint16_t)bytes[idx];
+                checksum = ((checksum << 15) | (checksum >> 1)) +
+                    (uint16_t)bytes[idx];
         }
         return checksum;
@@ -310 +313 @@
         array[1].stream.valid_data_size = host2uint64_t_le(ds->valid_data_size);
         array[1].stream.data_size = host2uint64_t_le(ds->data_size);
-        array[0].file.checksum = host2uint16_t_le(exfat_directory_set_checksum((uint8_t *)array,
+        array[0].file.checksum =
+            host2uint16_t_le(exfat_directory_set_checksum((uint8_t *)array,
             count * sizeof(exfat_dentry_t)));
 
@@ -352 +356 @@
         uctablep = EXFAT_NODE(fn);
 
-        uctable_chars = ALIGN_DOWN(uctablep->size, sizeof(uint16_t)) / sizeof(uint16_t); 
+        uctable_chars = ALIGN_DOWN(uctablep->size,
+            sizeof(uint16_t)) / sizeof(uint16_t); 
         uctable = (uint16_t *) malloc(uctable_chars * sizeof(uint16_t));
         rc = exfat_read_uctable(di->bs, uctablep, (uint8_t *)uctable);
@@ -417 +422 @@
                         return rc;
 
-                if (i == df.file.count - 2)
-                        chars = ds.stream.name_size - EXFAT_NAME_PART_LEN*(df.file.count - 2);
+                if (i == df.file.count - 2) {
+                        chars = ds.stream.name_size -
+                            EXFAT_NAME_PART_LEN*(df.file.count - 2);
+                }
+
                 rc = exfat_directory_get(di, &de);
                 if (rc != EOK)