Changes in uspace/srv/fs/exfat/exfat_directory.c [92d9406:0dbe5ac] in mainline

File:

• uspace/srv/fs/exfat/exfat_directory.c (modified) (12 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;
@@ -103 +101 @@
 {
         uint32_t i;
-        int rc = EOK;
+        int rc;
 
         i = (di->pos * sizeof(exfat_dentry_t)) / BPS(di->bs);
@@ -110 +108 @@
 
         if (di->b && di->bnum != i) {
-                rc = block_put(di->b);
+                block_put(di->b);
                 di->b = NULL;
-                if (rc != EOK)
-                        return rc;
         }
         if (!di->b) {
@@ -130 +126 @@
                 di->bnum = i;
         }
-        return rc;
+        return EOK;
 }
 
@@ -268 +264 @@
                 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;
@@ -290 +285 @@
         for (i = 0; i < count; i++) {
                 rc = exfat_directory_get(di, &de);
-                if (rc != EOK) {
-                        free(array);
-                        return rc;
-                }
+                if (rc != EOK)
+                        return rc;
                 array[i] = *de;
                 rc = exfat_directory_next(di);
@@ -313 +306 @@
         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)));
 
@@ -320 +312 @@
         for (i = 0; i < count; i++) {
                 rc = exfat_directory_get(di, &de);
-                if (rc != EOK) {
-                        free(array);
-                        return rc;
-                }
+                if (rc != EOK)
+                        return rc;
                 *de = array[i];
                 di->b->dirty = true;
@@ -356 +346 @@
         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);
@@ -422 +411 @@
                         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)
@@ -438 +424 @@
 
                 di->b->dirty = true;
+                sname += chars;
         }
         
@@ -447 +434 @@
         int rc, count;
         exfat_dentry_t *de;
-
-        di->pos = pos;
 
         rc = exfat_directory_get(di, &de);