Changeset 30413b31 in mainline for uspace/srv/fs/exfat/exfat_directory.c

Timestamp:

2011-12-10T08:29:44Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

d9f8dd13

Parents:

b8b1e631 (diff), 87955bfb (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 with mainline

File:

• uspace/srv/fs/exfat/exfat_directory.c (modified) (8 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;
         }
@@ -126 +128 @@
                 di->bnum = i;
         }
-        return EOK;
+        return rc;
 }
 
@@ -285 +287 @@
         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);
@@ -312 +316 @@
         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;
@@ -424 +430 @@
 
                 di->b->dirty = true;
-                sname += chars;
         }
         
@@ -434 +439 @@
         int rc, count;
         exfat_dentry_t *de;
+
+        di->pos = pos;
 
         rc = exfat_directory_get(di, &de);