Changeset 8ebe212 in mainline

Timestamp:

2018-04-13T12:39:06Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

18b6a88

Parents:

f712a85

git-author:

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

git-committer:

Jiri Svoboda <jiri@…> (2018-04-13 12:39:06)

Message:

ccheck-fix a few files with for loops.

Files:

• kernel/genarch/src/ofw/ofw_tree.c (modified) (8 diffs)
• kernel/generic/src/smp/smp_call.c (modified) (1 diff)
• kernel/generic/src/sysinfo/sysinfo.c (modified) (2 diffs)
• uspace/app/tester/mm/common.c (modified) (3 diffs)
• uspace/app/vuhid/main.c (modified) (1 diff)
• uspace/drv/bus/usb/xhci/hc.c (modified) (1 diff)
• uspace/lib/bithenge/src/script.c (modified) (1 diff)
• uspace/lib/c/generic/malloc.c (modified) (4 diffs)

kernel/genarch/src/ofw/ofw_tree.c

@@ -106 +106 @@
          * Try to find the disambigued name.
          */
-        for (ofw_tree_node_t * cur = node->child; cur; cur = cur->peer) {
+        for (ofw_tree_node_t *cur = node->child; cur; cur = cur->peer) {
                 if (str_cmp(cur->da_name, name) == 0)
                         return cur;
@@ -118 +118 @@
          * are not always fully-qualified.
          */
-        for (ofw_tree_node_t * cur = node->child; cur; cur = cur->peer) {
+        for (ofw_tree_node_t *cur = node->child; cur; cur = cur->peer) {
                 if (str_cmp(ofw_tree_node_name(cur), name) == 0)
                         return cur;
@@ -138 +138 @@
     const char *dtype)
 {
-        for (ofw_tree_node_t * cur = node->child; cur; cur = cur->peer) {
+        for (ofw_tree_node_t *cur = node->child; cur; cur = cur->peer) {
                 ofw_tree_property_t *prop =
                     ofw_tree_getprop(cur, "device_type");
@@ -167 +167 @@
     phandle handle)
 {
-        for (ofw_tree_node_t * cur = root; cur; cur = cur->peer) {
+        for (ofw_tree_node_t *cur = root; cur; cur = cur->peer) {
                 if (cur->node_handle == handle)
                         return cur;
@@ -194 +194 @@
     const char *dtype)
 {
-        for (ofw_tree_node_t * cur = node->peer; cur; cur = cur->peer) {
+        for (ofw_tree_node_t *cur = node->peer; cur; cur = cur->peer) {
                 ofw_tree_property_t *prop =
                     ofw_tree_getprop(cur, "device_type");
@@ -220 +220 @@
     const char *name)
 {
-        for (ofw_tree_node_t * cur = node->peer; cur; cur = cur->peer) {
+        for (ofw_tree_node_t *cur = node->peer; cur; cur = cur->peer) {
                 ofw_tree_property_t *prop =
                     ofw_tree_getprop(cur, "name");
@@ -284 +284 @@
     const char *dtype, ofw_tree_walker_t walker, void *arg)
 {
-        for (ofw_tree_node_t * cur = node; cur; cur = cur->peer) {
+        for (ofw_tree_node_t *cur = node; cur; cur = cur->peer) {
                 ofw_tree_property_t *prop =
                     ofw_tree_getprop(cur, "device_type");
@@ -388 +388 @@
         char *cur_path = (char *) malloc(PATH_MAX_LEN, 0);
 
-        for (ofw_tree_node_t * cur = node; cur; cur = cur->peer) {
+        for (ofw_tree_node_t *cur = node; cur; cur = cur->peer) {
                 if ((cur->parent) && (path))
                         snprintf(cur_path, PATH_MAX_LEN, "%s.%s", path, cur->da_name);

kernel/generic/src/smp/smp_call.c

@@ -222 +222 @@
 
         /* Walk the list manually, so that we can safely remove list items. */
-        for (link_t * cur = calls_list.head.next, *next = cur->next;
+        for (link_t *cur = calls_list.head.next, *next = cur->next;
             !list_empty(&calls_list); cur = next, next = cur->next) {
 

kernel/generic/src/sysinfo/sysinfo.c

@@ -511 +511 @@
                         break;
                 case SYSINFO_VAL_VAL:
-                        printf(" -> %" PRIun" (%#" PRIxn ")\n", cur->val.val,
+                        printf(" -> %" PRIun " (%#" PRIxn ")\n", cur->val.val,
                             cur->val.val);
                         break;
@@ -519 +519 @@
                 case SYSINFO_VAL_FUNCTION_VAL:
                         val = cur->val.gen_val.fn(cur, cur->val.gen_val.data);
-                        printf(" -> %" PRIun" (%#" PRIxn ") [generated]\n", val,
+                        printf(" -> %" PRIun " (%#" PRIxn ") [generated]\n", val,
                             val);
                         break;

uspace/app/tester/mm/common.c

@@ -269 +269 @@
 void fill_block(mem_block_t *block)
 {
-        for (uint8_t * pos = block->addr, *end = pos + block->size;
+        for (uint8_t *pos = block->addr, *end = pos + block->size;
             pos < end; pos++)
                 *pos = block_expected_value(block, pos);
@@ -286 +286 @@
 void check_block(mem_block_t *block)
 {
-        for (uint8_t * pos = block->addr, *end = pos + block->size;
+        for (uint8_t *pos = block->addr, *end = pos + block->size;
             pos < end; pos++) {
                 if (*pos != block_expected_value(block, pos)) {
@@ -402 +402 @@
 void fill_area(mem_area_t *area)
 {
-        for (uint8_t * pos = area->addr, *end = pos + area->size;
+        for (uint8_t *pos = area->addr, *end = pos + area->size;
             pos < end; pos++)
                 *pos = area_expected_value(area, pos);

uspace/app/vuhid/main.c

@@ -172 +172 @@
 {
         printf("Available devices:\n");
-        for (vuhid_interface_t * *i = available_hid_interfaces; *i != NULL; ++i) {
+        for (vuhid_interface_t **i = available_hid_interfaces; *i != NULL; ++i) {
                 printf("\t`%s'\t%s\n", (*i)->id, (*i)->name);
         }

uspace/drv/bus/usb/xhci/hc.c

@@ -87 +87 @@
         xhci_port_speed_t *speeds = hc->speeds;
 
-        for (xhci_extcap_t * ec = hc->xecp; ec; ec = xhci_extcap_next(ec)) {
+        for (xhci_extcap_t *ec = hc->xecp; ec; ec = xhci_extcap_next(ec)) {
                 xhci_dump_extcap(ec);
                 switch (XHCI_REG_RD(ec, XHCI_EC_CAP_ID)) {

uspace/lib/bithenge/src/script.c

@@ -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);

uspace/lib/c/generic/malloc.c

@@ -874 +874 @@
  *
  */
-void *realloc(void * const addr, const size_t size)
+void *realloc(void *const addr, const size_t size)
 {
         if (size == 0) {
@@ -988 +988 @@
  *
  */
-void free(void * const addr)
+void free(void *const addr)
 {
         if (addr == NULL)
@@ -996 +996 @@
 
         /* Calculate the position of the header. */
-        heap_block_head_t *head
-            = (heap_block_head_t *) (addr - sizeof(heap_block_head_t));
+        heap_block_head_t *head =
+            (heap_block_head_t *) (addr - sizeof(heap_block_head_t));
 
         block_check(head);
@@ -1012 +1012 @@
 
         /* Look at the next block. If it is free, merge the two. */
-        heap_block_head_t *next_head
-            = (heap_block_head_t *) (((void *) head) + head->size);
+        heap_block_head_t *next_head =
+            (heap_block_head_t *) (((void *) head) + head->size);
 
         if ((void *) next_head < area->end) {