Changeset 8565a42 in mainline for uspace/lib/c/generic/loader.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/loader.c (modified) (12 diffs)

uspace/lib/c/generic/loader.c

@@ -65 +65 @@
         if (ldr == NULL)
                 return NULL;
-        
+
         async_sess_t *sess =
             service_connect_blocking(SERVICE_LOADER, INTERFACE_LOADER, 0);
@@ -72 +72 @@
                 return NULL;
         }
-        
+
         ldr->sess = sess;
         return ldr;
@@ -91 +91 @@
         /* Get task ID. */
         async_exch_t *exch = async_exchange_begin(ldr->sess);
-        
+
         ipc_call_t answer;
         aid_t req = async_send_0(exch, LOADER_GET_TASKID, &answer);
         errno_t rc = async_data_read_start(exch, task_id, sizeof(task_id_t));
-        
-        async_exchange_end(exch);
-        
+
+        async_exchange_end(exch);
+
         if (rc != EOK) {
                 async_forget(req);
                 return (errno_t) rc;
         }
-        
+
         async_wait_for(req, &rc);
         return (errno_t) rc;
@@ -121 +121 @@
         if (!cwd)
                 return ENOMEM;
-        
+
         if (vfs_cwd_get(cwd, MAX_PATH_LEN + 1) != EOK)
                 str_cpy(cwd, MAX_PATH_LEN + 1, "/");
-        
+
         size_t len = str_length(cwd);
-        
-        async_exch_t *exch = async_exchange_begin(ldr->sess);
-        
+
+        async_exch_t *exch = async_exchange_begin(ldr->sess);
+
         ipc_call_t answer;
         aid_t req = async_send_0(exch, LOADER_SET_CWD, &answer);
         errno_t rc = async_data_write_start(exch, cwd, len);
-        
+
         async_exchange_end(exch);
         free(cwd);
-        
+
         if (rc != EOK) {
                 async_forget(req);
                 return (errno_t) rc;
         }
-        
+
         async_wait_for(req, &rc);
         return (errno_t) rc;
@@ -195 +195 @@
                 name++;
         }
-        
+
         int fd;
         errno_t rc = vfs_lookup(path, 0, &fd);
@@ -201 +201 @@
                 return rc;
         }
-        
+
         rc = loader_set_program(ldr, name, fd);
         vfs_put(fd);
@@ -232 +232 @@
                 ap++;
         }
-        
+
         char *arg_buf = malloc(buffer_size);
         if (arg_buf == NULL)
                 return ENOMEM;
-        
+
         /* Now fill the buffer with null-terminated argument strings */
         ap = argv;
         char *dp = arg_buf;
-        
+
         while (*ap != NULL) {
                 str_cpy(dp, buffer_size - (dp - arg_buf), *ap);
@@ -246 +246 @@
                 ap++;
         }
-        
+
         /* Send serialized arguments to the loader */
         async_exch_t *exch = async_exchange_begin(ldr->sess);
-        
+
         ipc_call_t answer;
         aid_t req = async_send_0(exch, LOADER_SET_ARGS, &answer);
         errno_t rc = async_data_write_start(exch, (void *) arg_buf,
             buffer_size);
-        
+
         async_exchange_end(exch);
         free(arg_buf);
-        
+
         if (rc != EOK) {
                 async_forget(req);
                 return (errno_t) rc;
         }
-        
+
         async_wait_for(req, &rc);
         return (errno_t) rc;
@@ -280 +280 @@
         async_exch_t *exch = async_exchange_begin(ldr->sess);
         async_exch_t *vfs_exch = vfs_exchange_begin();
-        
+
         aid_t req = async_send_0(exch, LOADER_ADD_INBOX, NULL);
-        
+
         errno_t rc = async_data_write_start(exch, name, str_size(name) + 1);
         if (rc == EOK) {
                 rc = vfs_pass_handle(vfs_exch, file, exch);
         }
-        
+
         async_exchange_end(vfs_exch);
         async_exchange_end(exch);
-        
+
         if (rc == EOK) {
                 async_wait_for(req, &rc);
@@ -296 +296 @@
                 async_forget(req);
         }
-        
+
         return (errno_t) rc;
 }
@@ -315 +315 @@
         errno_t rc = async_req_0_0(exch, LOADER_LOAD);
         async_exchange_end(exch);
-        
+
         return rc;
 }
@@ -338 +338 @@
         errno_t rc = async_req_0_0(exch, LOADER_RUN);
         async_exchange_end(exch);
-        
+
         if (rc != EOK)
                 return rc;
-        
+
         async_hangup(ldr->sess);
         free(ldr);
-        
+
         return EOK;
 }