Changeset 6843a9c in mainline for uspace/srv/fs/exfat/exfat_directory.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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 mainline changes

Trivial conflicts.

File:

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

uspace/srv/fs/exfat/exfat_directory.c

@@ -92 +92 @@
         int rc = EOK;
         
-        if (di->b)
+        if (di->b) {
                 rc = block_put(di->b);
+                di->b = NULL;
+        }
         
         return rc;
@@ -101 +103 @@
 {
         uint32_t i;
-        int rc;
+        int rc = EOK;
 
         i = (di->pos * sizeof(exfat_dentry_t)) / BPS(di->bs);
@@ -108 +110 @@
 
         if (di->b && di->bnum != i) {
-                block_put(di->b);
+                rc = block_put(di->b);
                 di->b = NULL;
+                if (rc != EOK)
+                        return rc;
         }
         if (!di->b) {
@@ -126 +130 @@
                 di->bnum = i;
         }
-        return EOK;
+        return rc;
 }
 
@@ -264 +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;
@@ -285 +290 @@
         for (i = 0; i < count; i++) {
                 rc = exfat_directory_get(di, &de);
-                if (rc != EOK)
-                        return rc;
+                if (rc != EOK) {
+                        free(array);
+                        return rc;
+                }
                 array[i] = *de;
                 rc = exfat_directory_next(di);
@@ -306 +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)));
 
@@ -312 +320 @@
         for (i = 0; i < count; i++) {
                 rc = exfat_directory_get(di, &de);
-                if (rc != EOK)
-                        return rc;
+                if (rc != EOK) {
+                        free(array);
+                        return rc;
+                }
                 *de = array[i];
                 di->b->dirty = true;
@@ -346 +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);
@@ -360 +371 @@
         ds.stream.valid_data_size = 0;
         ds.stream.data_size = 0;
-        ds.stream.name_size = utf16_length(wname);
+        ds.stream.name_size = exfat_utf16_length(wname);
         ds.stream.hash = host2uint16_t_le(exfat_name_hash(wname, uctable, 
             uctable_chars));
@@ -411 +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)
@@ -424 +438 @@
 
                 di->b->dirty = true;
-                sname += chars;
         }
         
@@ -434 +447 @@
         int rc, count;
         exfat_dentry_t *de;
+
+        di->pos = pos;
 
         rc = exfat_directory_get(di, &de);