Changeset 3bacee1 in mainline for uspace/lib/bithenge

Timestamp:

2018-04-12T16:27:17Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3cf22f9

Parents:

76d0981d

git-author:

Jiri Svoboda <jiri@…> (2018-04-11 19:25:33)

git-committer:

Jiri Svoboda <jiri@…> (2018-04-12 16:27:17)

Message:

Make ccheck-fix again and commit more good files.

Location:

uspace/lib/bithenge/src

Files:

• print.c (modified) (3 diffs)
• script.c (modified) (7 diffs)

uspace/lib/bithenge/src/print.c

@@ -101 +101 @@
         newline(state);
         state->first = false;
-        bool add_quotes = state->type == BITHENGE_PRINT_JSON
-            && bithenge_node_type(key) != BITHENGE_NODE_STRING;
+        bool add_quotes = state->type == BITHENGE_PRINT_JSON &&
+            bithenge_node_type(key) != BITHENGE_NODE_STRING;
         if (add_quotes)
                 state_printf(state, "\"");
@@ -225 +225 @@
 errno_t bithenge_print_node(bithenge_print_type_t type, bithenge_node_t *tree)
 {
-        state_t state = {type, true, 0, NULL, 0};
+        state_t state = { type, true, 0, NULL, 0 };
         return print_node(&state, tree);
 }
@@ -240 +240 @@
     bithenge_print_type_t type, bithenge_node_t *tree)
 {
-        state_t state = {type, true, 0, *str, *size};
+        state_t state = { type, true, 0, *str, *size };
         errno_t rc = print_node(&state, tree);
         *str = state.buffer;

uspace/lib/bithenge/src/script.c

@@ -206 +206 @@
                 state->token = TOKEN_EOF;
         } else if (ch == '#') {
-                while (state->buffer[state->buffer_pos] != '\n'
-                    && state->buffer[state->buffer_pos] != '\0') {
+                while (state->buffer[state->buffer_pos] != '\n' &&
+                    state->buffer[state->buffer_pos] != '\0') {
                         state->buffer_pos++;
                         fill_buffer(state);
@@ -225 +225 @@
                 return;
         } else if (isalpha(ch)) {
-                while (isalnum(state->buffer[state->buffer_pos])
-                    || state->buffer[state->buffer_pos] == '_')
+                while (isalnum(state->buffer[state->buffer_pos]) ||
+                    state->buffer[state->buffer_pos] == '_')
                         state->buffer_pos++;
                 char *value = str_ndup(state->buffer + state->old_buffer_pos,
@@ -401 +401 @@
     const char *name)
 {
-        for (transform_list_t *e = state->transform_list; e; e = e->next) {
+        for (transform_list_t * e = state->transform_list; e; e = e->next) {
                 if (!str_cmp(e->name, name)) {
                         bithenge_transform_inc_ref(e->transform);
@@ -774 +774 @@
                                 expect(state, ',');
                         params = state_realloc(state, params,
-                            (num_params + 1)*sizeof(*params));
+                            (num_params + 1) * sizeof(*params));
                         if (state->error != EOK)
                                 break;
@@ -784 +784 @@
 
         /* TODO: show correct error position */
-        if (state->error == EOK
-            && bithenge_transform_num_params(result) != num_params)
+        if (state->error == EOK &&
+            bithenge_transform_num_params(result) != num_params)
                 syntax_error(state, "incorrect number of parameters before");
 
@@ -1115 +1115 @@
                 num++;
                 subxforms = state_realloc(state, subxforms,
-                    (num + 1)*sizeof(*subxforms));
+                    (num + 1) * sizeof(*subxforms));
         }
 
@@ -1233 +1233 @@
                         state->parameter_names = state_realloc(state,
                             state->parameter_names,
-                            (state->num_params + 1)*sizeof(*state->parameter_names));
+                            (state->num_params + 1) * sizeof(*state->parameter_names));
                         if (state->error != EOK)
                                 break;