Changeset a35b458 in mainline for uspace/lib/c/generic/io/console.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/io/console.c (modified) (13 diffs)

uspace/lib/c/generic/io/console.c

@@ -48 +48 @@
         if (!ctrl)
                 return NULL;
-        
+
         ctrl->input_sess = vfs_fsession(ifile, INTERFACE_CONSOLE);
         if (!ctrl->input_sess) {
@@ -54 +54 @@
                 return NULL;
         }
-        
+
         ctrl->output_sess = vfs_fsession(ofile, INTERFACE_CONSOLE);
         if (!ctrl->output_sess) {
@@ -60 +60 @@
                 return NULL;
         }
-        
+
         ctrl->input = ifile;
         ctrl->output = ofile;
         ctrl->input_aid = 0;
-        
+
         return ctrl;
 }
@@ -95 +95 @@
         errno_t rc = async_req_0_2(exch, CONSOLE_GET_SIZE, cols, rows);
         async_exchange_end(exch);
-        
+
         return rc;
 }
@@ -134 +134 @@
         errno_t rc = async_req_0_1(exch, CONSOLE_GET_COLOR_CAP, ccap);
         async_exchange_end(exch);
-        
+
         return rc;
 }
@@ -143 +143 @@
         errno_t rc = async_req_0_2(exch, CONSOLE_GET_POS, col, row);
         async_exchange_end(exch);
-        
+
         return rc;
 }
@@ -183 +183 @@
         if (ctrl->input_aid == 0) {
                 ipc_call_t result;
-                
+
                 async_exch_t *exch = async_exchange_begin(ctrl->input_sess);
                 aid_t aid = async_send_0(exch, CONSOLE_GET_EVENT, &result);
                 async_exchange_end(exch);
-                
+
                 errno_t rc;
                 async_wait_for(aid, &rc);
-                
+
                 if (rc != EOK) {
                         errno = rc;
                         return false;
                 }
-                
+
                 rc = console_ev_decode(&result, event);
                 if (rc != EOK) {
@@ -204 +204 @@
                 errno_t retval;
                 async_wait_for(ctrl->input_aid, &retval);
-                
+
                 ctrl->input_aid = 0;
-                
+
                 if (retval != EOK) {
                         errno = retval;
                         return false;
                 }
-                
+
                 errno_t rc = console_ev_decode(&ctrl->input_call, event);
                 if (rc != EOK) {
@@ -218 +218 @@
                 }
         }
-        
+
         return true;
 }
@@ -227 +227 @@
         struct timeval t0;
         gettimeofday(&t0, NULL);
-        
+
         if (ctrl->input_aid == 0) {
                 async_exch_t *exch = async_exchange_begin(ctrl->input_sess);
@@ -234 +234 @@
                 async_exchange_end(exch);
         }
-        
+
         errno_t retval;
         errno_t rc = async_wait_timeout(ctrl->input_aid, &retval, *timeout);
@@ -242 +242 @@
                 return false;
         }
-        
+
         ctrl->input_aid = 0;
-        
+
         if (retval != EOK) {
                 errno = retval;
                 return false;
         }
-        
+
         rc = console_ev_decode(&ctrl->input_call, event);
         if (rc != EOK) {
@@ -255 +255 @@
                 return false;
         }
-        
+
         /* Update timeout */
         struct timeval t1;
         gettimeofday(&t1, NULL);
         *timeout -= tv_sub_diff(&t1, &t0);
-        
+
         return true;
 }