Changeset 8565a42 in mainline for kernel/generic/src/proc/program.c

Timestamp:

2018-03-02T20:34:50Z (7 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a1a81f69, d5e5fd1

Parents:

3061bc1 (diff), 34e1206 (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.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)

git-committer:

GitHub <noreply@…> (2018-03-02 20:34:50)

Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

File:

• kernel/generic/src/proc/program.c (modified) (11 diffs)

kernel/generic/src/proc/program.c

@@ -75 +75 @@
         if (!prg->task)
                 return ELIMIT;
-        
+
         /*
          * Create the stack address space area.
@@ -94 +94 @@
                 return ENOMEM;
         }
-        
+
         uspace_arg_t *kernel_uarg = (uspace_arg_t *)
             malloc(sizeof(uspace_arg_t), 0);
-        
+
         kernel_uarg->uspace_entry = (void *) entry_addr;
         kernel_uarg->uspace_stack = (void *) virt;
@@ -104 +104 @@
         kernel_uarg->uspace_thread_arg = NULL;
         kernel_uarg->uspace_uarg = NULL;
-        
+
         /*
          * Create the main thread.
@@ -117 +117 @@
                 return ELIMIT;
         }
-        
+
         return EOK;
 }
@@ -142 +142 @@
         if (!as)
                 return ENOMEM;
-        
+
         prg->loader_status = elf_load((elf_header_t *) image_addr, as, 0);
         if (prg->loader_status != EE_OK) {
@@ -148 +148 @@
                 prg->task = NULL;
                 prg->main_thread = NULL;
-                
+
                 if (prg->loader_status != EE_LOADER)
                         return ENOTSUP;
-                
+
                 /* Register image as the program loader */
                 if (program_loader != NULL)
                         return ELIMIT;
-                
+
                 program_loader = image_addr;
                 log(LF_OTHER, LVL_NOTE, "Program loader at %p", (void *) image_addr);
-                
+
                 return EOK;
         }
-        
+
         return program_create(as, ((elf_header_t *) image_addr)->e_entry,
             name, prg);
@@ -179 +179 @@
         if (!as)
                 return ENOMEM;
-        
+
         void *loader = program_loader;
         if (!loader) {
@@ -187 +187 @@
                 return ENOENT;
         }
-        
+
         prg->loader_status = elf_load((elf_header_t *) program_loader, as,
             ELD_F_LOADER);
@@ -196 +196 @@
                 return ENOENT;
         }
-        
+
         return program_create(as, ((elf_header_t *) program_loader)->e_entry,
             name, prg);
@@ -230 +230 @@
         if (name_len > TASK_NAME_BUFLEN - 1)
                 name_len = TASK_NAME_BUFLEN - 1;
-        
+
         char namebuf[TASK_NAME_BUFLEN];
         errno_t rc = copy_from_uspace(namebuf, uspace_name, name_len);
         if (rc != EOK)
                 return (sys_errno_t) rc;
-        
+
         namebuf[name_len] = 0;
-        
+
         /* Spawn the new task. */
         program_t prg;
@@ -243 +243 @@
         if (rc != EOK)
                 return rc;
-        
+
         // FIXME: control the permissions
         perm_set(prg.task, perm_get(TASK));
         program_ready(&prg);
-        
+
         return EOK;
 }