Changes in uspace/app/fontviewer/fontviewer.c [38d150e:09d13c8e] in mainline

File:

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

uspace/app/fontviewer/fontviewer.c

@@ -38 +38 @@
 #include <stdlib.h>
 #include <stdbool.h>
+#include <str_error.h>
 #include <window.h>
 #include <canvas.h>
@@ -62 +63 @@
 char *font_path = NULL;
 
-static int draw(void);
+static errno_t draw(void);
 
 static void on_keyboard_event(widget_t *widget, void *data)
@@ -95 +96 @@
         }
         
-        int rc = draw();
+        errno_t rc = draw();
         if (rc != EOK) {
-                printf("Failed drawing: %d.\n", rc);
+                printf("Failed drawing: %s.\n", str_error(rc));
                 exit(1);
         }
@@ -103 +104 @@
 }
 
-static int create_font(font_t **font, uint16_t points)
+static errno_t create_font(font_t **font, uint16_t points)
 {
         if (font_path == NULL) {
@@ -138 +139 @@
 
 static int text(drawctx_t *, font_t *, source_t *, surface_coord_t x,
-    surface_coord_t , const char *, ...) PRINTF_ATTRIBUTE(6, 7);
+    surface_coord_t , const char *, ...) _HELENOS_PRINTF_ATTRIBUTE(6, 7);
 static int text(drawctx_t *drawctx, font_t *font, source_t *source,
     surface_coord_t x, surface_coord_t y, const char *fmt, ...)
@@ -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;
@@ -161 +161 @@
 
 
-static int draw(void)
+static errno_t draw(void)
 {
         source_t background = rgb(255, 255, 255);
@@ -174 +174 @@
         
         font_t *font;
-        int rc = create_font(&font, points);
+        errno_t rc = create_font(&font, points);
         if (rc != EOK) {
                 printf("Failed creating font\n");
@@ -274 +274 @@
         height = WINDOW_HEIGHT;
         
-        int rc = draw();
+        errno_t rc = draw();
         if (rc != EOK) {
-                printf("Failed drawing: %d.\n", rc);
+                printf("Failed drawing: %s.\n", str_error(rc));
                 return 2;
         }