Changeset e950803 in mainline for uspace/srv/fs/devfs/devfs_ops.c

Timestamp:

2011-02-03T20:20:01Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial

Children:

bfe43d5

Parents:

bd81386 (diff), b366a1bc (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:~jakub/helenos/fs.

File:

• uspace/srv/fs/devfs/devfs_ops.c (modified) (4 diffs)

uspace/srv/fs/devfs/devfs_ops.c

@@ -130 +130 @@
 {
         devfs_node_t *node = (devfs_node_t *) pfn->data;
+        int ret;
         
         if (node->handle == 0) {
@@ -145 +146 @@
                                 
                                 if (str_cmp(devs[pos].name, component) == 0) {
+                                        ret = devfs_node_get_internal(rfn, DEV_HANDLE_NAMESPACE, devs[pos].handle);
                                         free(devs);
-                                        return devfs_node_get_internal(rfn, DEV_HANDLE_NAMESPACE, devs[pos].handle);
+                                        return ret;
                                 }
                         }
@@ -162 +164 @@
                                 for (pos = 0; pos < count; pos++) {
                                         if (str_cmp(devs[pos].name, component) == 0) {
+                                                ret = devfs_node_get_internal(rfn, DEV_HANDLE_DEVICE, devs[pos].handle);
                                                 free(devs);
-                                                return devfs_node_get_internal(rfn, DEV_HANDLE_DEVICE, devs[pos].handle);
+                                                return ret;
                                         }
                                 }
@@ -184 +187 @@
                         for (pos = 0; pos < count; pos++) {
                                 if (str_cmp(devs[pos].name, component) == 0) {
+                                        ret = devfs_node_get_internal(rfn, DEV_HANDLE_DEVICE, devs[pos].handle);
                                         free(devs);
-                                        return devfs_node_get_internal(rfn, DEV_HANDLE_DEVICE, devs[pos].handle);
+                                        return ret;
                                 }
                         }