Changeset 7715994 in mainline for uspace/app/trace/trace.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/app/trace/trace.c (modified) (8 diffs)

uspace/app/trace/trace.c

@@ -585 +585 @@
 }
 
-static loader_t *preload_task(const char *path, char *const argv[],
+static loader_t *preload_task(const char *path, char **argv,
     task_id_t *task_id)
 {
@@ -591 +591 @@
         int rc;
 
-        /* Spawn a program loader */    
+        /* Spawn a program loader */
         ldr = loader_connect();
         if (ldr == NULL)
@@ -607 +607 @@
 
         /* Send arguments */
-        rc = loader_set_args(ldr, argv);
+        rc = loader_set_args(ldr, (const char **) argv);
         if (rc != EOK)
                 goto error;
@@ -870 +870 @@
 }
 
-static display_mask_t parse_display_mask(char *text)
+static display_mask_t parse_display_mask(const char *text)
 {
         display_mask_t dm;
-        char *c;
-
-        c = text;
-
+        const char *c = text;
+        
         while (*c) {
                 switch (*c) {
-                case 't': dm = dm | DM_THREAD; break;
-                case 's': dm = dm | DM_SYSCALL; break;
-                case 'i': dm = dm | DM_IPC; break;
-                case 'p': dm = dm | DM_SYSTEM | DM_USER; break;
+                case 't':
+                        dm = dm | DM_THREAD;
+                        break;
+                case 's':
+                        dm = dm | DM_SYSCALL;
+                        break;
+                case 'i':
+                        dm = dm | DM_IPC;
+                        break;
+                case 'p':
+                        dm = dm | DM_SYSTEM | DM_USER;
+                        break;
                 default:
                         printf("Unexpected event type '%c'.\n", *c);
                         exit(1);
                 }
-
+                
                 ++c;
         }
-
+        
         return dm;
 }
@@ -896 +902 @@
 static int parse_args(int argc, char *argv[])
 {
-        char *arg;
         char *err_p;
 
         task_id = 0;
 
-        --argc; ++argv;
+        --argc;
+        ++argv;
 
         while (argc > 0) {
-                arg = *argv;
+                char *arg = *argv;
                 if (arg[0] == '+') {
                         display_mask = parse_display_mask(&arg[1]);
@@ -910 +916 @@
                         if (arg[1] == 't') {
                                 /* Trace an already running task */
-                                --argc; ++argv;
+                                --argc;
+                                ++argv;
                                 task_id = strtol(*argv, &err_p, 10);
                                 task_ldr = NULL;
@@ -927 +934 @@
                         break;
                 }
-
-                --argc; ++argv;
+                
+                --argc;
+                ++argv;
         }
 
         if (task_id != 0) {
-                if (argc == 0) return 0;
+                if (argc == 0)
+                        return 0;
                 printf("Extra arguments\n");
                 print_syntax();
@@ -946 +955 @@
         /* Preload the specified program file. */
         printf("Spawning '%s' with arguments:\n", *argv);
-        {
-                char **cp = argv;
-                while (*cp) printf("'%s'\n", *cp++);
-        }
+        
+        char **cp = argv;
+        while (*cp)
+                printf("'%s'\n", *cp++);
+        
         task_ldr = preload_task(*argv, argv, &task_id);
         task_wait_for = true;