Changes in uspace/lib/net/adt/module_map.c [25d2de69:1bfd3d3] in mainline

File:

• uspace/lib/net/adt/module_map.c (modified) (5 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>
@@ -59 +59 @@
  *                      running.
  * @param[in] connect_module The module connecting function.
- * @returns             EOK on success.
- * @returns             ENOMEM if there is not enough memory left.
+ * @return              EOK on success.
+ * @return              ENOMEM if there is not enough memory left.
  */
 int
-add_module(module_ref *module, modules_ref modules, const char *name,
+add_module(module_t **module, modules_t *modules, const char *name,
     const char *filename, services_t service, task_id_t task_id,
     connect_module_t connect_module)
 {
-        ERROR_DECLARE;
+        module_t *tmp_module;
+        int rc;
 
-        module_ref tmp_module;
-
-        tmp_module = (module_ref) malloc(sizeof(module_t));
+        tmp_module = (module_t *) malloc(sizeof(module_t));
         if (!tmp_module)
                 return ENOMEM;
@@ -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)
@@ -101 +100 @@
  * @param[in] modules   The module map.
  * @param[in] name      The module name.
- * @returns             The running module found. It does not have to be
+ * @return              The running module found. It does not have to be
  *                      connected.
- * @returns             NULL if there is no such module.
+ * @return              NULL if there is no such module.
  */
-module_ref get_running_module(modules_ref modules, char *name)
+module_t *get_running_module(modules_t *modules, char *name)
 {
-        module_ref module;
+        module_t *module;
 
         module = modules_find(modules, name, 0);
@@ -127 +126 @@
  *
  * @param[in] fname     The module full or relative path filename.
- * @returns             The new module task identifier on success.
- * @returns             Zero if there is no such module.
+ * @return              The new module task identifier on success.
+ * @return              Zero if there is no such module.
  */
 task_id_t spawn(const char *fname)
 {
-        const char *argv[2];
-        task_id_t res;
+        task_id_t id;
+        int rc;
         
-        argv[0] = fname;
-        argv[1] = NULL;
-        res = task_spawn(fname, argv, NULL);
+        rc = task_spawnl(&id, fname, fname, NULL);
+        if (rc != EOK)
+                return 0;
         
-        return res;
+        return id;
 }