Changes in uspace/app/fontviewer/fontviewer.c [1569a9b:05b59393] in mainline

File:

• uspace/app/fontviewer/fontviewer.c (modified) (4 diffs)

uspace/app/fontviewer/fontviewer.c

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