Changeset 2e37308 in mainline for uspace/srv/fs/tmpfs/tmpfs_dump.c

Timestamp:

2009-09-25T11:50:12Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6d4c549

Parents:

d27ed12 (diff), 12bdc942 (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 libfs error handling improvements.

File:

• uspace/srv/fs/tmpfs/tmpfs_dump.c (modified) (8 diffs)

uspace/srv/fs/tmpfs/tmpfs_dump.c

@@ -82 +82 @@
                                 return false;
                         
-                        fn = ops->create(dev, L_FILE);
-                        if (fn == NULL) {
+                        rc = ops->create(&fn, dev, L_FILE);
+                        if (rc != EOK || fn == NULL) {
                                 free(fname);
                                 return false;
@@ -90 +90 @@
                         if (block_seqread(dev, bufpos, buflen, pos, fname,
                             entry.len) != EOK) {
-                                ops->destroy(fn);
+                                (void) ops->destroy(fn);
                                 free(fname);
                                 return false;
@@ -98 +98 @@
                         rc = ops->link(pfn, fn, fname);
                         if (rc != EOK) {
-                                ops->destroy(fn);
+                                (void) ops->destroy(fn);
                                 free(fname);
                                 return false;
@@ -126 +126 @@
                                 return false;
                         
-                        fn = ops->create(dev, L_DIRECTORY);
-                        if (fn == NULL) {
+                        rc = ops->create(&fn, dev, L_DIRECTORY);
+                        if (rc != EOK || fn == NULL) {
                                 free(fname);
                                 return false;
@@ -134 +134 @@
                         if (block_seqread(dev, bufpos, buflen, pos, fname,
                             entry.len) != EOK) {
-                                ops->destroy(fn);
+                                (void) ops->destroy(fn);
                                 free(fname);
                                 return false;
@@ -142 +142 @@
                         rc = ops->link(pfn, fn, fname);
                         if (rc != EOK) {
-                                ops->destroy(fn);
+                                (void) ops->destroy(fn);
                                 free(fname);
                                 return false;
@@ -164 +164 @@
 {
         libfs_ops_t *ops = &tmpfs_libfs_ops;
+        fs_node_t *fn;
         int rc;
 
@@ -182 +183 @@
                 goto error;
         
-        if (!tmpfs_restore_recursion(dev, &bufpos, &buflen, &pos,
-            ops->root_get(dev)))
+        rc = ops->root_get(&fn, dev);
+        if (rc != EOK)
+                goto error;
+
+        if (!tmpfs_restore_recursion(dev, &bufpos, &buflen, &pos, fn))
                 goto error;