Changeset d5c1051 in mainline for uspace/lib/c/generic/io

Timestamp:

2017-12-20T22:25:34Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

39b54fe

Parents:

8610c2c

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-20 22:22:29)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-20 22:25:34)

Message:

"Obviously harmless" error handling tweaks.

Location:

uspace/lib/c/generic/io

Files:

• chardev.c (modified) (2 diffs)
• chardev_srv.c (modified) (2 diffs)
• table.c (modified) (2 diffs)

uspace/lib/c/generic/io/chardev.c

@@ -124 +124 @@
         *nread = IPC_GET_ARG2(answer);
         /* In case of partial success, ARG1 contains the error code */
-        return IPC_GET_ARG1(answer);
+        return (int) IPC_GET_ARG1(answer);
 
 }
@@ -175 +175 @@
         *nwritten = IPC_GET_ARG2(answer);
         /* In case of partial success, ARG1 contains the error code */
-        return IPC_GET_ARG1(answer);
+        return (int) IPC_GET_ARG1(answer);
 }
 

uspace/lib/c/generic/io/chardev_srv.c

@@ -82 +82 @@
 
         free(buf);
-        async_answer_2(callid, EOK, rc, nread);
+        async_answer_2(callid, EOK, (sysarg_t) rc, nread);
 }
 
@@ -111 +111 @@
         }
 
-        async_answer_2(callid, EOK, rc, nwr);
+        async_answer_2(callid, EOK, (sysarg_t) rc, nwr);
 }
 

uspace/lib/c/generic/io/table.c

@@ -478 +478 @@
         va_list args;
         int rc;
+        int ret;
         char *str;
         char *sp, *ep;
@@ -486 +487 @@
 
         va_start(args, fmt);
-        rc = vasprintf(&str, fmt, args);
+        ret = vasprintf(&str, fmt, args);
         va_end(args);
 
-        if (rc < 0) {
+        if (ret < 0) {
                 table->error = ENOMEM;
                 return table->error;