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

Timestamp:

2018-01-30T03:20:45Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/lib/usbhid/src/hidpath.c (modified) (8 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>
@@ -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;
         }
 }