Changeset f959a20f in mainline for uspace/lib/usbhid/src/hiddescriptor.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/lib/usbhid/src/hiddescriptor.c (modified) (3 diffs)

uspace/lib/usbhid/src/hiddescriptor.c

@@ -89 +89 @@
     usb_hid_report_path_t *cmp_path)
 {
-        link_t *path_it = report->collection_paths.head.next;
-        usb_hid_report_path_t *path = NULL;
-
-        if ((report == NULL) || (cmp_path == NULL)) {
+        if (report == NULL || cmp_path == NULL)
                 return NULL;
-        }
-
-        while (path_it != &report->collection_paths.head) {
-                path = list_get_instance(path_it, usb_hid_report_path_t,
-                    cpath_link);
-
+
+        list_foreach(report->collection_paths, cpath_link, usb_hid_report_path_t, path) {
                 if (usb_hid_report_compare_usage_path(path, cmp_path,
-                    USB_HID_PATH_COMPARE_STRICT) == 0) {
-                        break;
-                }
-                path_it = path_it->next;
-        }
-        if (path_it == &report->collection_paths.head) {
-                path = usb_hid_report_path_clone(cmp_path);
-                if (path == NULL) {
-                        return NULL;
-                }
-                list_append(&path->cpath_link, &report->collection_paths);
-                report->collection_paths_count++;
-
-                return path;
-        } else {
-                return list_get_instance(path_it, usb_hid_report_path_t,
-                    cpath_link);
-        }
+                    USB_HID_PATH_COMPARE_STRICT) == 0)
+                        return path;
+        }
+
+        usb_hid_report_path_t *path = usb_hid_report_path_clone(cmp_path);
+        if (path == NULL)
+                return NULL;
+
+        list_append(&path->cpath_link, &report->collection_paths);
+        report->collection_paths_count++;
+
+        return path;
 }
 
@@ -474 +461 @@
                                     usb_hid_report_item_t, link);
 
+                                link_t *tmp_link = list_prev(
+                                    &report_item->usage_path->cpath_link,
+                                    &report->collection_paths);
+                                assert(tmp_link);
+
                                 usb_hid_report_usage_path_t *tmp_usage_path;
-                                tmp_usage_path = list_get_instance(
-                                    report_item->usage_path->cpath_link.prev,
+                                tmp_usage_path = list_get_instance(tmp_link,
                                     usb_hid_report_usage_path_t, rpath_items_link);
 
@@ -486 +477 @@
 
                                 usb_hid_report_path_free(report_item->usage_path);
-                                list_remove (item_link);
+                                list_remove(item_link);
 
                                 break;