Changes in uspace/lib/usbhid/src/hidpath.c [a1732929:3ca4ae9] in mainline

File:

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

uspace/lib/usbhid/src/hidpath.c

@@ -36 +36 @@
 #include <errno.h>
 #include <stdio.h>
-#include <malloc.h>
 #include <mem.h>
+#include <stdlib.h>
 #include <usb/debug.h>
 #include <assert.h>
@@ -173 +173 @@
 void usb_hid_print_usage_path(usb_hid_report_path_t *path)
 {
-        usb_log_debug("USAGE_PATH FOR RId(%d):", path->report_id);
-        usb_log_debug("\tLENGTH: %d", path->depth);
+        usb_log_debug("USAGE_PATH FOR RId(%d):\n", path->report_id);
+        usb_log_debug("\tLENGTH: %d\n", path->depth);
 
         list_foreach(path->items, rpath_items_link,
             usb_hid_report_usage_path_t, path_item) {
 
-                usb_log_debug("\tUSAGE_PAGE: %X", path_item->usage_page);
-                usb_log_debug("\tUSAGE: %X", path_item->usage);
-                usb_log_debug("\tFLAGS: %d", path_item->flags);
+                usb_log_debug("\tUSAGE_PAGE: %X\n", path_item->usage_page);
+                usb_log_debug("\tUSAGE: %X\n", path_item->usage);
+                usb_log_debug("\tFLAGS: %d\n", path_item->flags);
         }
 }
@@ -191 +191 @@
  * @param flags       Flags determining the mode of comparison
  *
- * @return EOK if both paths are identical, non zero number otherwise
+ * @return 0 if both paths are identical, non zero number otherwise
  *
  */
@@ -213 +213 @@
         // Empty path match all others
         if (path->depth == 0) {
-                return EOK;
+                return 0;
         }
         
@@ -239 +239 @@
                                         if (USB_HID_SAME_USAGE(report_item->usage,
                                             path_item->usage))
-                                                return EOK;
+                                                return 0;
                                 } else {
-                                        return EOK;
+                                        return 0;
                                 }
                         }
@@ -285 +285 @@
                     ((report_link == &report_path->items.head) &&
                     (path_link == &path->items.head))) {
-                        return EOK;
+                        return 0;
                 } else {
                         return 1;
@@ -297 +297 @@
                 
                 if (list_empty(&path->items)) {
-                        return EOK;
+                        return 0;
                 }
                 
@@ -320 +320 @@
                 
                 if (path_link == &path->items.head) {
-                        return EOK;
+                        return 0;
                 } else {
                         return 1;
@@ -327 +327 @@
         
         default:
-                return EINVAL;
+                return -1;
         }
 }