Changeset 132ab5d1 in mainline for uspace/app/tester/stdio/stdio1.c

Timestamp:

2018-01-30T03:20:45Z (8 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/app/tester/stdio/stdio1.c (modified) (5 diffs)

uspace/app/tester/stdio/stdio1.c

@@ -30 +30 @@
 #include <stdlib.h>
 #include <stddef.h>
+#include <str_error.h>
 #include <errno.h>
 #include "../tester.h"
@@ -46 +47 @@
         file = fopen(file_name, "rt");
         if (file == NULL) {
-                TPRINTF("errno = %d\n", errno);
+                TPRINTF("errno = %s\n", str_error_name(errno));
                 return "Failed opening file";
         } else
@@ -54 +55 @@
         size_t cnt = fread(buf, 1, BUF_SIZE, file);
         if (ferror(file)) {
-                TPRINTF("errno = %d\n", errno);
+                TPRINTF("errno = %s\n", str_error_name(errno));
                 fclose(file);
                 return "Failed reading file";
@@ -65 +66 @@
         TPRINTF("Seek to beginning...");
         if (fseek(file, 0, SEEK_SET) != 0) {
-                TPRINTF("errno = %d\n", errno);
+                TPRINTF("errno = %s\n", str_error_name(errno));
                 fclose(file);
                 return "Failed seeking in file";
@@ -83 +84 @@
         TPRINTF("Close...");
         if (fclose(file) != 0) {
-                TPRINTF("errno = %d\n", errno);
+                TPRINTF("errno = %s\n", str_error_name(errno));
                 return "Failed closing file";
         } else