Changeset a35b458 in mainline for uspace/app/bdsh/tok.c

Timestamp:

2018-03-02T20:10:49Z (6 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/app/bdsh/tok.c (modified) (11 diffs)

uspace/app/bdsh/tok.c

@@ -59 +59 @@
         tok->in_char_offset = 0;
         tok->last_in_char_offset = 0;
-        
+
         tok->outtok = out_tokens;
         tok->outtok_offset = 0;
         tok->outtok_size = max_tokens;
-        
+
         /* Prepare a buffer where all the token strings will be stored */
         size_t len = str_size(input) + max_tokens + 1;
         char *tmp = malloc(len);
-        
+
         if (tmp == NULL) {
                 return ENOMEM;
         }
-        
+
         tok->outbuf = tmp;
         tok->outbuf_offset = 0;
         tok->outbuf_size = len;
         tok->outbuf_last_start = 0;
-        
+
         return EOK;
 }
@@ -93 +93 @@
         errno_t rc;
         wchar_t next_char;
-        
+
         /* Read the input line char by char and append tokens */
         while ((next_char = tok_look_char(tok)) != 0) {
@@ -113 +113 @@
                         }
                         tok_push_token(tok);
-                        
+
                 }
                 else if (next_char == '|') {
@@ -125 +125 @@
                                 }
                         }
-                        
+
                         tok_start_token(tok, TOKTYPE_PIPE);
-                        
+
                         rc = tok_push_char(tok, tok_get_char(tok));
                         if (rc != EOK) {
                                 return rc;
                         }
-                        
+
                         rc = tok_push_token(tok);
                         if (rc != EOK) {
@@ -163 +163 @@
                 }
         }
-        
+
         /* Push the last token */
         if (tok_pending_chars(tok)) {
@@ -171 +171 @@
                 }
         }
-        
+
         *tokens_length = tok->outtok_offset;
-        
+
         return EOK;
 }
@@ -182 +182 @@
         errno_t rc;
         wchar_t next_char;
-        
+
         while ((next_char = tok_look_char(tok)) != 0) {
                 if (next_char == '\'') {
@@ -193 +193 @@
                                         return rc;
                                 }
-                                
+
                                 /* Swallow the additional one in the input */
                                 tok_get_char(tok);
@@ -209 +209 @@
                 }
         }
-        
+
         /* If we are here, the string run to the end without being closed */
         return EINVAL;
@@ -249 +249 @@
                 return EOVERFLOW;
         }
-        
+
         if (tok->outbuf_offset >= tok->outbuf_size) {
                 return EOVERFLOW;
         }
-        
+
         tok->outbuf[tok->outbuf_offset++] = 0;
         token_t *tokinfo = &tok->outtok[tok->outtok_offset++];
@@ -263 +263 @@
         tokinfo->char_length = tok->in_char_offset - tok->last_in_char_offset;
         tok->outbuf_last_start = tok->outbuf_offset;
-        
+
         /* We have consumed the first char of the next token already */
         tok->last_in_offset = tok->in_offset;
         tok->last_in_char_offset = tok->in_char_offset;
-        
+
         return EOK;
 }