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

uspace/lib/usbhid/src/hidpath.c

@@ -250 +250 @@
                  * Path is prefix of the report_path
                  */
-                report_link = report_path->items.head.next;
-                path_link = path->items.head.next;
-
-                while ((report_link != &report_path->items.head) &&
-                    (path_link != &path->items.head)) {
+                report_link = list_first(&report_path->items);
+                path_link = list_first(&path->items);
+
+                while (report_link != NULL && path_link != NULL) {
 
                         report_item = list_get_instance(report_link,
@@ -268 +267 @@
                                 return 1;
                         } else {
-                                report_link = report_link->next;
-                                path_link = path_link->next;
+                                report_link = list_next(report_link, &report_path->items);
+                                path_link = list_next(path_link, &path->items);
                         }
                 }
 
                 if ((((flags & USB_HID_PATH_COMPARE_BEGIN) != 0) &&
-                    (path_link == &path->items.head)) ||
-                    ((report_link == &report_path->items.head) &&
-                    (path_link == &path->items.head))) {
+                    (path_link == NULL)) ||
+                    (report_link == NULL && path_link == NULL)) {
                         return 0;
                 } else {
@@ -287 +285 @@
                  * Path is suffix of report_path
                  */
-                report_link = report_path->items.head.prev;
-                path_link = path->items.head.prev;
+                report_link = list_last(&report_path->items);
+                path_link = list_last(&path->items);
 
                 if (list_empty(&path->items)) {
@@ -294 +292 @@
                 }
 
-                while ((report_link != &report_path->items.head) &&
-                    (path_link != &path->items.head)) {
+                while (report_link != NULL && path_link != NULL) {
                         report_item = list_get_instance(report_link,
                             usb_hid_report_usage_path_t, rpath_items_link);
@@ -308 +305 @@
                                 return 1;
                         } else {
-                                report_link = report_link->prev;
-                                path_link = path_link->prev;
+                                report_link = list_prev(report_link, &report_path->items);
+                                path_link = list_prev(path_link, &path->items);
                         }
                 }
 
-                if (path_link == &path->items.head) {
+                if (path_link == NULL) {
                         return 0;
                 } else {