Changeset 7494fb4 in mainline for uspace/lib/net/adt/module_map.c

Timestamp:

2010-11-13T19:12:37Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c7137738

Parents:

63a1e60 (diff), 71e3289 (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

File:

• uspace/lib/net/adt/module_map.c (modified) (3 diffs)

uspace/lib/net/adt/module_map.c

@@ -38 +38 @@
 #include <task.h>
 #include <unistd.h>
-#include <err.h>
+#include <errno.h>
 
 #include <ipc/services.h>
@@ -67 +67 @@
     connect_module_t connect_module)
 {
-        ERROR_DECLARE;
-
         module_ref tmp_module;
+        int rc;
 
         tmp_module = (module_ref) malloc(sizeof(module_t));
@@ -83 +82 @@
         tmp_module->connect_module = connect_module;
 
-        if (ERROR_OCCURRED(modules_add(modules, tmp_module->name, 0,
-            tmp_module))) {
+        rc = modules_add(modules, tmp_module->name, 0, tmp_module);
+        if (rc != EOK) {
                 free(tmp_module);
-                return ERROR_CODE;
+                return rc;
         }
         if (module)