Changeset f959a20f in mainline for uspace/srv/devman/match.c

Timestamp:

2019-02-01T22:32:38Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Children:

00b7fc8

Parents:

1a37496

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-01 21:22:39)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-01 22:32:38)

Message:

Avoid directly using .head/.next/.prev of list_t/link_t

Use existing constructs from <adt/list.h> instead.

File:

• uspace/srv/devman/match.c (modified) (2 diffs)

uspace/srv/devman/match.c

@@ -67 +67 @@
 int get_match_score(driver_t *drv, dev_node_t *dev)
 {
-        link_t *drv_head = &drv->match_ids.ids.head;
-        link_t *dev_head = &dev->pfun->match_ids.ids.head;
-
-        if (list_empty(&drv->match_ids.ids) ||
-            list_empty(&dev->pfun->match_ids.ids)) {
+        list_t *drv_list = &drv->match_ids.ids;
+        list_t *dev_list = &dev->pfun->match_ids.ids;
+
+        if (list_empty(drv_list) || list_empty(dev_list))
                 return 0;
-        }
 
         /*
@@ -80 +78 @@
         int highest_score = 0;
 
-        link_t *drv_link = drv->match_ids.ids.head.next;
-        while (drv_link != drv_head) {
-                link_t *dev_link = dev_head->next;
-                while (dev_link != dev_head) {
-                        match_id_t *drv_id = list_get_instance(drv_link, match_id_t, link);
-                        match_id_t *dev_id = list_get_instance(dev_link, match_id_t, link);
-
+        list_foreach(*drv_list, link, match_id_t, drv_id) {
+                list_foreach(*dev_list, link, match_id_t, dev_id) {
                         int score = compute_match_score(drv_id, dev_id);
-                        if (score > highest_score) {
+                        if (score > highest_score)
                                 highest_score = score;
-                        }
-
-                        dev_link = dev_link->next;
                 }
-
-                drv_link = drv_link->next;
         }