Changeset 5a6cc679 in mainline for uspace/app/bdsh/tok.c

Timestamp:

2018-01-31T02:21:24Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

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) {