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

Timestamp:

2010-03-07T15:11:56Z (14 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

aadf01e

Parents:

2e99277 (diff), 137691a (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, revision 308

File:

• uspace/srv/net/structures/module_map.c (modified) (2 diffs)

uspace/srv/net/structures/module_map.c

@@ -49 +49 @@
 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;
 
@@ -86 +86 @@
 }
 
-task_id_t spawn( char * fname ){
-        char * argv[ 2 ];
-//      char * argv[ 4 ];
+task_id_t spawn( const char * fname ){
+        const char * argv[ 2 ];
         task_id_t       res;
 
-//      printf( "Spawning %s\n", fname );
         argv[ 0 ] = fname;
         argv[ 1 ] = NULL;
         res = task_spawn( fname, argv );
-/*      argv[ 0 ] = "/app/trace";
-        argv[ 1 ] = "+ti";
-        argv[ 2 ] = fname;
-        argv[ 3 ] = NULL;
-        res = task_spawn( "/app/trace", argv );
-*/
-        if( res != 0 ){
-                /* Success */
-                usleep( 10000 );
-        }
+
         return res;
 }