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

uspace/lib/usbhid/src/hidparser.c

@@ -493 +493 @@
 
         if (field == NULL) {
-                field_it = report_des->report_items.head.next;
-        } else {
-                field_it = field->ritems_link.next;
-        }
-
-        while (field_it != &report_des->report_items.head) {
+                field_it = list_first(&report_des->report_items);
+        } else {
+                field_it = list_next(&field->ritems_link, &report_des->report_items);
+        }
+
+        while (field_it != NULL) {
                 field = list_get_instance(field_it, usb_hid_report_field_t,
                     ritems_link);
@@ -514 +514 @@
                         usb_hid_report_remove_last_item(field->collection_path);
                 }
-                field_it = field_it->next;
+                field_it = list_next(field_it, &report_des->report_items);
         }
 
@@ -547 +547 @@
                         return 0;
                 } else {
-                        report_it = report_des->reports_link.next;
+                        report_it = list_next(&report_des->reports_link,
+                            &report->reports);
                 }
         } else {
-                report_it = report->reports.head.next;
-        }
-
-        while (report_it != &report->reports.head) {
+                report_it = list_first(&report->reports);
+        }
+
+        while (report_it != NULL) {
                 report_des = list_get_instance(report_it,
                     usb_hid_report_description_t, reports_link);
@@ -561 +562 @@
                 }
 
-                report_it = report_it->next;
+                report_it = list_next(report_it, &report->reports);
         }