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

Timestamp:

2018-01-13T03:10:29Z (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:

a53ed3a

Parents:

36f0738

Message:

Use errno_t in all uspace and kernel code.

Change type of every variable, parameter and return value that holds an
<errno.h> constant to either errno_t (the usual case), or sys_errno_t
(some places in kernel). This is for the purpose of self-documentation,
as well as for type-checking with a bit of type definition hackery.

Although this is a massive commit, it is a simple text replacement, and thus
is very easy to verify. Simply do the following:

`
git checkout <this commit's hash>
git reset HEAD
<sup>git add .
tools/srepl '\berrno_t\b' int
git add .
tools/srepl '\bsys_errno_t\b' sysarg_t
git reset
git diff
`</sup>

While this doesn't ensure that the replacements are correct, it does ensure
that the commit doesn't do anything except those replacements. Since errno_t
is typedef'd to int in the usual case (and sys_errno_t to sysarg_t), even if
incorrect, this commit cannot change behavior.

File:

• uspace/app/bdsh/tok.c (modified) (6 diffs)

uspace/app/bdsh/tok.c

@@ -38 +38 @@
 static wchar_t tok_get_char(tokenizer_t *);
 static wchar_t tok_look_char(tokenizer_t *);
-static int tok_push_char(tokenizer_t *, wchar_t);
-static int tok_push_token(tokenizer_t *);
+static errno_t tok_push_char(tokenizer_t *, wchar_t);
+static errno_t tok_push_token(tokenizer_t *);
 static bool tok_pending_chars(tokenizer_t *);
-static int tok_finish_string(tokenizer_t *);
+static errno_t tok_finish_string(tokenizer_t *);
 static void tok_start_token(tokenizer_t *, token_type_t);
 
@@ -51 +51 @@
  * @param max_tokens number of elements of the out_tokens array
  */
-int tok_init(tokenizer_t *tok, char *input, token_t *out_tokens,
+errno_t tok_init(tokenizer_t *tok, char *input, token_t *out_tokens,
     size_t max_tokens)
 {       
@@ -89 +89 @@
 
 /** Tokenize the input string into the tokens */
-int tok_tokenize(tokenizer_t *tok, size_t *tokens_length)
-{
-        int rc;
+errno_t tok_tokenize(tokenizer_t *tok, size_t *tokens_length)
+{
+        errno_t rc;
         wchar_t next_char;
         
@@ -178 +178 @@
 
 /** Finish tokenizing an opened string */
-int tok_finish_string(tokenizer_t *tok)
-{
-        int rc;
+errno_t tok_finish_string(tokenizer_t *tok)
+{
+        errno_t rc;
         wchar_t next_char;
         
@@ -233 +233 @@
 
 /** Append a char to the end of the current token */
-int tok_push_char(tokenizer_t *tok, wchar_t ch)
+errno_t tok_push_char(tokenizer_t *tok, wchar_t ch)
 {
         return chr_encode(ch, tok->outbuf, &tok->outbuf_offset, tok->outbuf_size);
@@ -244 +244 @@
 
 /** Push the current token to the output array */
-int tok_push_token(tokenizer_t *tok)
+errno_t tok_push_token(tokenizer_t *tok)
 {
         if (tok->outtok_offset >= tok->outtok_size) {