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

Timestamp:

2018-03-02T20:10:49Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

f1380b7

Parents:

3061bc1

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)

git-committer:

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

Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

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;
 }