Changeset 7715994 in mainline for uspace/app/init/init.c

Timestamp:

2010-03-13T12:17:02Z (15 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/app/init/init.c (modified) (5 diffs)

uspace/app/init/init.c

@@ -62 +62 @@
 static bool mount_root(const char *fstype)
 {
-        char *opts = "";
+        const char *opts = "";
         const char *root_dev = "bd/initrd";
         
@@ -117 +117 @@
 }
 
-static void spawn(char *fname)
-{
-        char *argv[2];
+static void spawn(const char *fname)
+{
+        const char *argv[2];
         struct stat s;
         
@@ -134 +134 @@
 }
 
-static void srv_start(char *fname)
-{
-        char *argv[2];
+static void srv_start(const char *fname)
+{
+        const char *argv[2];
         task_id_t id;
         task_exit_t texit;
@@ -168 +168 @@
 }
 
-static void console(char *dev)
-{
-        char *argv[3];
+static void console(const char *dev)
+{
+        const char *argv[3];
         char hid_in[DEVMAP_NAME_MAXLEN];
         int rc;
@@ -193 +193 @@
 }
 
-static void getterm(char *dev, char *app)
-{
-        char *argv[4];
+static void getterm(const char *dev, const char *app)
+{
+        const char *argv[4];
         char term[DEVMAP_NAME_MAXLEN];
         int rc;