Changeset a35b458 in mainline for uspace/lib/c/generic/loader.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:

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