Changes in uspace/lib/bithenge/src/script.c [6cd10ac:b7fd2a0] in mainline

File:

• uspace/lib/bithenge/src/script.c (modified) (23 diffs)

uspace/lib/bithenge/src/script.c

@@ -99 +99 @@
         /** Rather than constantly checking return values, the parser uses this
          * to indicate whether an error has occurred. */
-        int error;
+        errno_t error;
 
         /** The list of named transforms. */
@@ -148 +148 @@
 
 /** Note that an error has occurred if error is not EOK. */
-static void error_errno(state_t *state, int error)
+static void error_errno(state_t *state, errno_t error)
 {
         // Don't overwrite a previous error.
@@ -276 +276 @@
                         state->buffer_pos++;
                 state->token = TOKEN_INTEGER;
-                int rc = bithenge_parse_int(state->buffer +
+                errno_t rc = bithenge_parse_int(state->buffer +
                     state->old_buffer_pos, &state->token_int);
                 error_errno(state, rc);
@@ -520 +520 @@
 static bithenge_expression_t *parse_term(state_t *state)
 {
-        int rc;
+        errno_t rc;
         if (state->token == TOKEN_TRUE || state->token == TOKEN_FALSE) {
                 bool val = state->token == TOKEN_TRUE;
@@ -630 +630 @@
 static bithenge_expression_t *parse_postfix_expression(state_t *state)
 {
-        int rc;
+        errno_t rc;
         bithenge_expression_t *expr = parse_term(state);
         while (state->error == EOK) {
@@ -737 +737 @@
                         break;
                 }
-                int rc = bithenge_binary_expression(&expr, op, expr, expr2);
+                errno_t rc = bithenge_binary_expression(&expr, op, expr, expr2);
                 if (rc != EOK) {
                         expr = NULL;
@@ -797 +797 @@
 
         if (num_params) {
-                int rc = bithenge_param_wrapper(&result, result, params);
+                errno_t rc = bithenge_param_wrapper(&result, result, params);
                 if (rc != EOK) {
                         error_errno(state, rc);
@@ -813 +813 @@
 {
         bithenge_node_t *node;
-        int rc = bithenge_new_empty_internal_node(&node);
+        errno_t rc = bithenge_new_empty_internal_node(&node);
         if (rc != EOK) {
                 error_errno(state, rc);
@@ -869 +869 @@
 
         bithenge_transform_t *if_xform;
-        int rc = bithenge_if_transform(&if_xform, expr, true_xform,
+        errno_t rc = bithenge_if_transform(&if_xform, expr, true_xform,
             false_xform);
         if (rc != EOK) {
@@ -893 +893 @@
                         next_token(state);
                         bithenge_node_t *node;
-                        int rc = bithenge_new_boolean_node(&node, true);
+                        errno_t rc = bithenge_new_boolean_node(&node, true);
                         if (rc != EOK) {
                                 error_errno(state, rc);
@@ -907 +907 @@
                         if (state->error == EOK) {
                                 bithenge_expression_inc_ref(ref_expr);
-                                int rc = bithenge_binary_expression(&expr,
+                                errno_t rc = bithenge_binary_expression(&expr,
                                     BITHENGE_EXPRESSION_EQUALS, ref_expr,
                                     expr);
@@ -947 +947 @@
         while (state->error == EOK && num >= 1) {
                 num--;
-                int rc = bithenge_if_transform(&switch_xform, exprs[num],
+                errno_t rc = bithenge_if_transform(&switch_xform, exprs[num],
                     xforms[num], switch_xform);
                 if (rc != EOK) {
@@ -987 +987 @@
 
         bithenge_transform_t *repeat_xform;
-        int rc = bithenge_repeat_transform(&repeat_xform, xform, expr);
+        errno_t rc = bithenge_repeat_transform(&repeat_xform, xform, expr);
         if (rc != EOK) {
                 error_errno(state, rc);
@@ -1013 +1013 @@
 
         bithenge_transform_t *do_while_xform;
-        int rc = bithenge_do_while_transform(&do_while_xform, xform, expr);
+        errno_t rc = bithenge_do_while_transform(&do_while_xform, xform, expr);
         if (rc != EOK) {
                 error_errno(state, rc);
@@ -1031 +1031 @@
 
                 bithenge_expression_t *in_expr;
-                int rc = bithenge_in_node_expression(&in_expr);
+                errno_t rc = bithenge_in_node_expression(&in_expr);
                 if (rc != EOK)
                         error_errno(state, rc);
@@ -1061 +1061 @@
         }
 
-        int rc = bithenge_partial_transform(&xform, xform);
+        errno_t rc = bithenge_partial_transform(&xform, xform);
         if (rc != EOK) {
                 error_errno(state, rc);
@@ -1130 +1130 @@
         subxforms[num].transform = NULL;
         bithenge_transform_t *result;
-        int rc = bithenge_new_struct(&result, subxforms);
+        errno_t rc = bithenge_new_struct(&result, subxforms);
         if (rc != EOK) {
                 error_errno(state, rc);
@@ -1153 +1153 @@
 
                 bithenge_transform_t *xform;
-                int rc;
+                errno_t rc;
                 if (state->in_node_used)
                         rc = bithenge_expression_transform(&xform, expr);
@@ -1211 +1211 @@
         if (xforms) {
                 xforms[0] = result;
-                int rc = bithenge_new_composed_transform(&result, xforms, num);
+                errno_t rc = bithenge_new_composed_transform(&result, xforms, num);
                 if (rc != EOK) {
                         error_errno(state, rc);
@@ -1244 +1244 @@
         bithenge_transform_t *barrier = NULL;
         if (state->error == EOK) {
-                int rc = bithenge_new_barrier_transform(&barrier,
+                errno_t rc = bithenge_new_barrier_transform(&barrier,
                     state->num_params);
                 if (rc != EOK) {
@@ -1259 +1259 @@
 
         if (state->error == EOK) {
-                int rc = bithenge_barrier_transform_set_subtransform(barrier,
+                errno_t rc = bithenge_barrier_transform_set_subtransform(barrier,
                     xform);
                 xform = NULL;
@@ -1321 +1321 @@
  * @return EOK on success, EINVAL on syntax error, or an error code from
  * errno.h. */
-int bithenge_parse_script(const char *filename, bithenge_transform_t **out)
+errno_t bithenge_parse_script(const char *filename, bithenge_transform_t **out)
 {
         state_t state;
@@ -1328 +1328 @@
                 parse_definition(&state);
         *out = get_named_transform(&state, "main");
-        int rc = state.error;
+        errno_t rc = state.error;
         state_destroy(&state);
         if (rc == EOK && !*out) {