Index: uspace/lib/draw/font.c
===================================================================
--- uspace/lib/draw/font.c	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
+++ uspace/lib/draw/font.c	(revision e211ea04fccf33d4cb2092f630a29e893e096a02)
@@ -60,13 +60,13 @@
 }
 
-int font_get_metrics(font_t *font, font_metrics_t *metrics) {
+errno_t font_get_metrics(font_t *font, font_metrics_t *metrics) {
 	return font->backend->get_font_metrics(font->backend_data, metrics);
 }
 
-int font_resolve_glyph(font_t *font, wchar_t c, glyph_id_t *glyph_id) {
+errno_t font_resolve_glyph(font_t *font, wchar_t c, glyph_id_t *glyph_id) {
 	return font->backend->resolve_glyph(font->backend_data, c, glyph_id);
 }
 
-int font_get_glyph_metrics(font_t *font, glyph_id_t glyph_id,
+errno_t font_get_glyph_metrics(font_t *font, glyph_id_t glyph_id,
     glyph_metrics_t *glyph_metrics)
 {
@@ -75,5 +75,5 @@
 }
 
-int font_render_glyph(font_t *font, drawctx_t *context, source_t *source,
+errno_t font_render_glyph(font_t *font, drawctx_t *context, source_t *source,
     sysarg_t x, sysarg_t y, glyph_id_t glyph_id)
 {
@@ -83,8 +83,8 @@
 
 /* TODO this is bad interface */
-int font_get_box(font_t *font, char *text, sysarg_t *width, sysarg_t *height)
+errno_t font_get_box(font_t *font, char *text, sysarg_t *width, sysarg_t *height)
 {
 	font_metrics_t fm;
-	int rc = font_get_metrics(font, &fm);
+	errno_t rc = font_get_metrics(font, &fm);
 	if (rc != EOK)
 		return rc;
@@ -101,5 +101,5 @@
 		rc = font_resolve_glyph(font, c, &glyph_id);
 		if (rc != EOK) {
-			int rc2 = font_resolve_glyph(font, U_SPECIAL, &glyph_id);
+			errno_t rc2 = font_resolve_glyph(font, U_SPECIAL, &glyph_id);
 			if (rc2 != EOK) {
 				return rc;
@@ -121,5 +121,5 @@
 
 /* TODO this is bad interface */
-int font_draw_text(font_t *font, drawctx_t *context, source_t *source,
+errno_t font_draw_text(font_t *font, drawctx_t *context, source_t *source,
     const char *text, sysarg_t sx, sysarg_t sy)
 {
@@ -128,5 +128,5 @@
 
 	font_metrics_t fm;
-	int rc = font_get_metrics(font, &fm);
+	errno_t rc = font_get_metrics(font, &fm);
 	if (rc != EOK)
 		return rc;
@@ -144,5 +144,5 @@
 		rc = font_resolve_glyph(font, c, &glyph_id);
 		if (rc != EOK) {
-			int rc2 = font_resolve_glyph(font, U_SPECIAL, &glyph_id);
+			errno_t rc2 = font_resolve_glyph(font, U_SPECIAL, &glyph_id);
 			if (rc2 != EOK) {
 				return rc;