Changeset 1569a9b in mainline for uspace/lib/usbdev/src/recognise.c

Timestamp:

2017-12-24T16:40:33Z (6 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

48fd597

Parents:

a1026da

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-24 16:40:33)

git-committer:

GitHub <noreply@…> (2017-12-24 16:40:33)

Message:

The "not-so-obvious" error handling tweaks. (#9)

Some more changes to enable type-checking with errno_t. Some of the "fixes" here don't quite feel right, but a proper solution would be a more elaborate refactoring of the surrounding code.

File:

• uspace/lib/usbdev/src/recognise.c (modified) (1 diff)

uspace/lib/usbdev/src/recognise.c

@@ -88 +88 @@
                 char *str = NULL; \
                 int __rc = asprintf(&str, format, ##__VA_ARGS__); \
-                if (__rc > 0) { \
-                        __rc = usb_add_match_id((match_ids), (score), str); \
-                } \
-                if (__rc != EOK) { \
-                        free(str); \
-                        return __rc; \
+                if (__rc >= 0) { \
+                        int __rc = usb_add_match_id((match_ids), (score), str); \
+                        if (__rc != EOK) { \
+                                free(str); \
+                                return __rc; \
+                        } \
+                } else { \
+                        return ENOMEM; \
                 } \
         } while (0)