Changeset feeac0d in mainline for uspace/lib/usbhid/src/hidpath.c

Timestamp:

2013-09-10T16:32:35Z (11 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4982d87

Parents:

e8d6ce2

Message:

Simplify use of list_foreach.

File:

• uspace/lib/usbhid/src/hidpath.c (modified) (7 diffs)

uspace/lib/usbhid/src/hidpath.c

@@ -176 +176 @@
         usb_log_debug("\tLENGTH: %d\n", path->depth);
 
-        usb_hid_report_usage_path_t *path_item;
-
-        list_foreach(path->items, item) {
-                path_item = list_get_instance(item, usb_hid_report_usage_path_t,
-                        rpath_items_link);
+        list_foreach(path->items, rpath_items_link,
+            usb_hid_report_usage_path_t, path_item) {
 
                 usb_log_debug("\tUSAGE_PAGE: %X\n", path_item->usage_page);
@@ -237 +234 @@
                         usb_hid_report_usage_path_t, rpath_items_link);
 
-                list_foreach(report_path->items, report_link) {
-                        report_item = list_get_instance(report_link,
-                                usb_hid_report_usage_path_t, rpath_items_link);
-                                
+                list_foreach(report_path->items, rpath_items_link,
+                    usb_hid_report_usage_path_t, report_item) {
+
                         if(USB_HID_SAME_USAGE_PAGE(report_item->usage_page,
                                 path_item->usage_page)){
-                                        
+
                                 if(only_page == 0){
                                         if(USB_HID_SAME_USAGE(
                                                 report_item->usage,
                                                 path_item->usage)) {
-                                                        
+
                                                 return EOK;
                                         }
@@ -266 +262 @@
                         return 1;
                 }
-                
+
         /* path is prefix of the report_path */
         case USB_HID_PATH_COMPARE_BEGIN:
-        
+
                 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_item = list_get_instance(report_link, 
                                 usb_hid_report_usage_path_t, rpath_items_link);
-                                          
+
                         path_item = list_get_instance(path_link,
                                 usb_hid_report_usage_path_t, rpath_items_link);
@@ -286 +282 @@
                             !USB_HID_SAME_USAGE(report_item->usage, 
                                 path_item->usage))) {
-                        
+
                                 return 1;
-                        } 
-                        else {
+                        } else {
                                 report_link = report_link->next;
-                                path_link = path_link->next;                    
+                                path_link = path_link->next;
                         }
-                        
                 }
 
@@ -300 +294 @@
                    ((report_link == &report_path->items.head) && 
                         (path_link == &path->items.head))) {
-                                
+
                         return EOK;
                 }
@@ -405 +399 @@
         usb_hid_report_path_t *usage_path)
 {
-        usb_hid_report_usage_path_t *path_item;
         usb_hid_report_usage_path_t *new_path_item;
         usb_hid_report_path_t *new_usage_path = usb_hid_report_path ();
@@ -419 +412 @@
         }
 
-        list_foreach(usage_path->items, path_link) {
-                path_item = list_get_instance(path_link,
-                        usb_hid_report_usage_path_t, rpath_items_link);
+        list_foreach(usage_path->items, rpath_items_link,
+            usb_hid_report_usage_path_t, path_item) {
 
                 new_path_item = malloc(sizeof(usb_hid_report_usage_path_t));