Changeset 1569a9b in mainline for uspace/lib

Timestamp:

2017-12-24T16:40:33Z (8 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.

Location:

uspace/lib

Files:

• c/include/io/klog.h (modified) (1 diff)
• http/src/request.c (modified) (4 diffs)
• usbdev/src/recognise.c (modified) (1 diff)

uspace/lib/c/include/io/klog.h

@@ -49 +49 @@
 #define KLOG_PRINTF(lvl, fmt, ...) ({ \
         char *_s; \
-        int _c = asprintf(&_s, fmt, ##__VA_ARGS__); \
-        if (_c >= 0) { \
-                _c = klog_write((lvl), _s, str_size(_s)); \
+        int _rc = ENOMEM; \
+        if (asprintf(&_s, fmt, ##__VA_ARGS__) >= 0) { \
+                _rc = klog_write((lvl), _s, str_size(_s)); \
                 free(_s); \
         }; \
-        (_c >= 0); \
+        (_rc != EOK); \
 })
 

uspace/lib/http/src/request.c

@@ -96 +96 @@
         ssize_t meth_size = http_encode_method(NULL, 0, req->method, req->path);
         if (meth_size < 0)
-                return meth_size;
+                return EINVAL;
         size_t size = meth_size;
         
@@ -102 +102 @@
                 ssize_t header_size = http_header_encode(header, NULL, 0);
                 if (header_size < 0)
-                        return header_size;
+                        return EINVAL;
                 size += header_size;
         }
@@ -116 +116 @@
         if (written < 0) {
                 free(buf);
-                return written;
+                return EINVAL;
         }
         pos += written;
@@ -125 +125 @@
                 if (written < 0) {
                         free(buf);
-                        return written;
+                        return EINVAL;
                 }
                 pos += written;

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)