Changeset 8565a42 in mainline for uspace/lib/c/generic/task.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:

• uspace/lib/c/generic/task.c (modified) (17 diffs)

uspace/lib/c/generic/task.c

@@ -55 +55 @@
         task_id_t task_id;
         (void) __SYSCALL1(SYS_TASK_GET_ID, (sysarg_t) &task_id);
-        
+
         return task_id;
 #endif  /* __32_BITS__ */
-        
+
 #ifdef __64_BITS__
         return (task_id_t) __SYSCALL0(SYS_TASK_GET_ID);
@@ -74 +74 @@
 {
         assert(name);
-        
+
         return (errno_t) __SYSCALL2(SYS_TASK_SET_NAME, (sysarg_t) name, str_size(name));
 }
@@ -108 +108 @@
 {
         /* Send default files */
-        
+
         int fd_stdin = -1;
         int fd_stdout = -1;
         int fd_stderr = -1;
-        
+
         if (stdin != NULL) {
                 (void) vfs_fhandle(stdin, &fd_stdin);
         }
-        
+
         if (stdout != NULL) {
                 (void) vfs_fhandle(stdout, &fd_stdout);
@@ -124 +124 @@
                 (void) vfs_fhandle(stderr, &fd_stderr);
         }
-        
+
         return task_spawnvf(id, wait, path, args, fd_stdin, fd_stdout,
             fd_stderr);
@@ -153 +153 @@
         if (ldr == NULL)
                 return EREFUSED;
-        
+
         bool wait_initialized = false;
-        
+
         /* Get task ID. */
         task_id_t task_id;
@@ -161 +161 @@
         if (rc != EOK)
                 goto error;
-        
+
         /* Send spawner's current working directory. */
         rc = loader_set_cwd(ldr);
         if (rc != EOK)
                 goto error;
-        
+
         /* Send program binary. */
         rc = loader_set_program_path(ldr, path);
         if (rc != EOK)
                 goto error;
-        
+
         /* Send arguments. */
         rc = loader_set_args(ldr, args);
         if (rc != EOK)
                 goto error;
-        
+
         /* Send files */
         int root = vfs_root();
@@ -185 +185 @@
                         goto error;
         }
-        
+
         if (fd_stdin >= 0) {
                 rc = loader_add_inbox(ldr, "stdin", fd_stdin);
@@ -191 +191 @@
                         goto error;
         }
-        
+
         if (fd_stdout >= 0) {
                 rc = loader_add_inbox(ldr, "stdout", fd_stdout);
@@ -197 +197 @@
                         goto error;
         }
-        
+
         if (fd_stderr >= 0) {
                 rc = loader_add_inbox(ldr, "stderr", fd_stderr);
@@ -203 +203 @@
                         goto error;
         }
-        
+
         /* Load the program. */
         rc = loader_load_program(ldr);
         if (rc != EOK)
                 goto error;
-        
+
         /* Setup waiting for return value if needed */
         if (wait) {
@@ -216 +216 @@
                 wait_initialized = true;
         }
-        
+
         /* Run it. */
         rc = loader_run(ldr);
         if (rc != EOK)
                 goto error;
-        
+
         /* Success */
         if (id != NULL)
                 *id = task_id;
-        
+
         return EOK;
-        
+
 error:
         if (wait_initialized)
                 task_cancel_wait(wait);
-        
+
         /* Error exit */
         loader_abort(ldr);
@@ -259 +259 @@
         if (arglist == NULL)
                 return ENOMEM;
-        
+
         /* Fill in arguments. */
         const char *arg;
@@ -267 +267 @@
                 arglist[cnt++] = arg;
         } while (arg != NULL);
-        
+
         /* Spawn task. */
         errno_t rc = task_spawnv(task_id, wait, path, arglist);
-        
+
         /* Free argument list. */
         free(arglist);
@@ -293 +293 @@
 {
         /* Count the number of arguments. */
-        
+
         va_list ap;
         const char *arg;
         int cnt = 0;
-        
+
         va_start(ap, path);
         do {
@@ -304 +304 @@
         } while (arg != NULL);
         va_end(ap);
-        
+
         va_start(ap, path);
         errno_t rc = task_spawn(task_id, wait, path, cnt, ap);
         va_end(ap);
-        
+
         return rc;
 }
@@ -400 +400 @@
         if (rc != EOK)
                 return rc;
-        
+
         return task_wait(&wait, texit, retval);
 }
@@ -413 +413 @@
         errno_t rc = (errno_t) async_req_1_0(exch, NS_RETVAL, val);
         async_exchange_end(exch);
-        
+
         return rc;
 }