Changeset 7715994 in mainline for uspace/srv/net/structures/module_map.c

Timestamp:

2010-03-13T12:17:02Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6ba20a6b

Parents:

d0febca (diff), 2070570 (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/srv/net/structures/module_map.c (modified) (2 diffs)

uspace/srv/net/structures/module_map.c

@@ -47 +47 @@
 #include "module_map.h"
 
-GENERIC_CHAR_MAP_IMPLEMENT( modules, module_t )
+GENERIC_CHAR_MAP_IMPLEMENT(modules, module_t)
 
-int add_module( module_ref * module, modules_ref modules, char * name, char * filename, services_t service, task_id_t task_id, connect_module_t connect_module ){
+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;
 
-        module_ref      tmp_module;
+        module_ref tmp_module;
 
-        tmp_module = ( module_ref ) malloc( sizeof( module_t ));
-        if( ! tmp_module ) return ENOMEM;
+        tmp_module = (module_ref) malloc(sizeof(module_t));
+        if(! tmp_module){
+                return ENOMEM;
+        }
         tmp_module->task_id = task_id;
         tmp_module->phone = 0;
@@ -63 +65 @@
         tmp_module->service = service;
         tmp_module->connect_module = connect_module;
-        if( ERROR_OCCURRED( modules_add( modules, tmp_module->name, 0, tmp_module ))){
-                free( tmp_module );
+        if(ERROR_OCCURRED(modules_add(modules, tmp_module->name, 0, tmp_module))){
+                free(tmp_module);
                 return ERROR_CODE;
         }
-        if( module ) * module = tmp_module;
+        if(module){
+                *module = tmp_module;
+        }
         return EOK;
 }
 
-module_ref get_running_module( modules_ref modules, char * name ){
-        module_ref      module;
+module_ref get_running_module(modules_ref modules, char * name){
+        module_ref module;
 
-        module = modules_find( modules, name, 0 );
-        if( ! module ) return NULL;
-        if( ! module->task_id ){
-                module->task_id = spawn( module->filename );
-                if( ! module->task_id ) return NULL;
+        module = modules_find(modules, name, 0);
+        if(! module){
+                return NULL;
         }
-        if( ! module->phone ){
-                module->phone = module->connect_module( module->service );
+        if(! module->task_id){
+                module->task_id = spawn(module->filename);
+                if(! module->task_id){
+                        return NULL;
+                }
+        }
+        if(! module->phone){
+                module->phone = module->connect_module(module->service);
         }
         return module;
 }
 
-task_id_t spawn( char * fname ){
-        char * argv[ 2 ];
-        task_id_t       res;
+task_id_t spawn(const char * fname){
+        const char * argv[2];
+        task_id_t res;
 
-        argv[ 0 ] = fname;
-        argv[ 1 ] = NULL;
-        res = task_spawn( fname, argv );
+        argv[0] = fname;
+        argv[1] = NULL;
+        res = task_spawn(fname, argv);
 
         return res;