Changeset 132ab5d1 in mainline for uspace/app/fontviewer/fontviewer.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/fontviewer/fontviewer.c (modified) (4 diffs)

uspace/app/fontviewer/fontviewer.c

@@ -36 +36 @@
 #include <stdlib.h>
 #include <errno.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdbool.h>
+#include <str_error.h>
 #include <window.h>
 #include <canvas.h>
@@ -97 +98 @@
         int rc = draw();
         if (rc != EOK) {
-                printf("Failed drawing: %d.\n", rc);
+                printf("Failed drawing: %s.\n", str_error(rc));
                 exit(1);
         }
@@ -148 +149 @@
         va_end(args);
         
-        if (ret <= 0)
-                return ret;
-        
-        drawctx_set_source(drawctx, source);
-        drawctx_set_font(drawctx, font);
-        drawctx_print(drawctx, str, x, y);
-        
-        free(str);
+        if (ret >= 0) {
+                drawctx_set_source(drawctx, source);
+                drawctx_set_font(drawctx, font);
+                drawctx_print(drawctx, str, x, y);
+
+                free(str);
+        }
         
         return ret;
@@ -276 +276 @@
         int rc = draw();
         if (rc != EOK) {
-                printf("Failed drawing: %d.\n", rc);
+                printf("Failed drawing: %s.\n", str_error(rc));
                 return 2;
         }