Changes in uspace/lib/usbdev/src/recognise.c [33b8d024:8d2dd7f2] in mainline

File:

• uspace/lib/usbdev/src/recognise.c (modified) (5 diffs)

uspace/lib/usbdev/src/recognise.c

@@ -60 +60 @@
  * @return Error code.
  */
-static errno_t usb_add_match_id(match_id_list_t *matches, int score,
-    char *match_str)
+static int usb_add_match_id(match_id_list_t *matches, int score,
+    const char *match_str)
 {
         assert(matches);
@@ -88 +88 @@
                 char *str = NULL; \
                 int __rc = asprintf(&str, format, ##__VA_ARGS__); \
-                if (__rc >= 0) { \
-                        errno_t __rc = usb_add_match_id((match_ids), (score), str); \
-                        if (__rc != EOK) { \
-                                free(str); \
-                                return __rc; \
-                        } \
-                } else { \
-                        return ENOMEM; \
+                if (__rc > 0) { \
+                        __rc = usb_add_match_id((match_ids), (score), str); \
+                } \
+                if (__rc != EOK) { \
+                        free(str); \
+                        return __rc; \
                 } \
         } while (0)
@@ -108 +106 @@
  * @retval ENOENT Device class is not "use interface".
  */
-errno_t usb_device_create_match_ids_from_interface(
+int usb_device_create_match_ids_from_interface(
     const usb_standard_device_descriptor_t *desc_device,
     const usb_standard_interface_descriptor_t *desc_interface,
@@ -220 +218 @@
  * @return Error code.
  */
-errno_t usb_device_create_match_ids_from_device_descriptor(
+int usb_device_create_match_ids_from_device_descriptor(
     const usb_standard_device_descriptor_t *device_descriptor,
     match_id_list_t *matches)
@@ -264 +262 @@
  * @return Error code.
  */
-errno_t usb_device_create_match_ids(usb_pipe_t *ctrl_pipe,
+int usb_device_create_match_ids(usb_pipe_t *ctrl_pipe,
     match_id_list_t *matches)
 {
         assert(ctrl_pipe);
-        errno_t rc;
+        int rc;
         /*
          * Retrieve device descriptor and add matches from it.