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

File:

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

uspace/lib/net/adt/module_map.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libnet
- * @{
+/** @addtogroup net
+ *  @{
  */
 
 /** @file
- * Character string to module map implementation.
+ *  Character string to module map implementation.
  */
 
@@ -38 +38 @@
 #include <task.h>
 #include <unistd.h>
-#include <errno.h>
 
 #include <ipc/services.h>
 
-#include <net/modules.h>
+#include <net_err.h>
+#include <net_modules.h>
 
 #include <adt/generic_char_map.h>
@@ -49 +49 @@
 GENERIC_CHAR_MAP_IMPLEMENT(modules, module_t)
 
-/** Adds module to the module map.
- *
- * @param[out] module   The module structure added.
- * @param[in] modules   The module map.
- * @param[in] name      The module name.
- * @param[in] filename  The full path filename.
- * @param[in] service   The module service.
- * @param[in] task_id   The module current task identifier. Zero means not
- *                      running.
- * @param[in] connect_module The module connecting function.
- * @return              EOK on success.
- * @return              ENOMEM if there is not enough memory left.
- */
-int
-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)
-{
-        module_t *tmp_module;
-        int rc;
+int add_module(module_ref * module, modules_ref modules, const char * name, const char * filename, services_t service, task_id_t task_id, connect_module_t connect_module){
+        ERROR_DECLARE;
 
-        tmp_module = (module_t *) malloc(sizeof(module_t));
-        if (!tmp_module)
+        module_ref tmp_module;
+
+        tmp_module = (module_ref) malloc(sizeof(module_t));
+        if(! tmp_module){
                 return ENOMEM;
-
+        }
         tmp_module->task_id = task_id;
         tmp_module->phone = 0;
@@ -81 +65 @@
         tmp_module->service = service;
         tmp_module->connect_module = connect_module;
-
-        rc = modules_add(modules, tmp_module->name, 0, tmp_module);
-        if (rc != EOK) {
+        if(ERROR_OCCURRED(modules_add(modules, tmp_module->name, 0, tmp_module))){
                 free(tmp_module);
-                return rc;
+                return ERROR_CODE;
         }
-        if (module)
+        if(module){
                 *module = tmp_module;
-
+        }
         return EOK;
 }
 
-/** Searches and returns the specified module.
- *
- * If the module is not running, the module filaname is spawned.
- * If the module is not connected, the connect_function is called.
- *
- * @param[in] modules   The module map.
- * @param[in] name      The module name.
- * @return              The running module found. It does not have to be
- *                      connected.
- * @return              NULL if there is no such module.
- */
-module_t *get_running_module(modules_t *modules, char *name)
-{
-        module_t *module;
+module_ref get_running_module(modules_ref modules, char * name){
+        module_ref module;
 
         module = modules_find(modules, name, 0);
-        if (!module)
+        if(! module){
                 return NULL;
-
-        if (!module->task_id) {
+        }
+        if(! module->task_id){
                 module->task_id = spawn(module->filename);
-                if (!module->task_id)
+                if(! module->task_id){
                         return NULL;
+                }
         }
-        if (!module->phone)
+        if(! module->phone){
                 module->phone = module->connect_module(module->service);
-
+        }
         return module;
 }
 
-/** Starts the given module.
- *
- * @param[in] fname     The module full or relative path filename.
- * @return              The new module task identifier on success.
- * @return              Zero if there is no such module.
- */
 task_id_t spawn(const char *fname)
 {
-        task_id_t id;
-        int rc;
+        const char *argv[2];
+        task_id_t res;
         
-        rc = task_spawnl(&id, fname, fname, NULL);
-        if (rc != EOK)
-                return 0;
+        argv[0] = fname;
+        argv[1] = NULL;
+        res = task_spawn(fname, argv, NULL);
         
-        return id;
+        return res;
 }