Index: uspace/app/mkfat/mkfat.c
===================================================================
--- uspace/app/mkfat/mkfat.c	(revision cecba66ea48d60cfa59865e98aeda663808e42c7)
+++ uspace/app/mkfat/mkfat.c	(revision e211ea04fccf33d4cb2092f630a29e893e096a02)
@@ -86,6 +86,6 @@
 static void syntax_print(void);
 
-static int fat_params_compute(struct fat_cfg *cfg);
-static int fat_blocks_write(struct fat_cfg const *cfg, service_id_t service_id);
+static errno_t fat_params_compute(struct fat_cfg *cfg);
+static errno_t fat_blocks_write(struct fat_cfg const *cfg, service_id_t service_id);
 static void fat_bootsec_create(struct fat_cfg const *cfg, struct fat_bs *bs);
 
@@ -94,5 +94,5 @@
 	struct fat_cfg cfg;
 
-	int rc;
+	errno_t rc;
 	char *dev_path;
 	service_id_t service_id;
@@ -252,5 +252,5 @@
 }
 
-static int fat_label_encode(void *dest, const char *src)
+static errno_t fat_label_encode(void *dest, const char *src)
 {
 	int i;
@@ -284,5 +284,5 @@
  * file system params.
  */
-static int fat_params_compute(struct fat_cfg *cfg)
+static errno_t fat_params_compute(struct fat_cfg *cfg)
 {
 	uint32_t fat_bytes;
@@ -356,5 +356,5 @@
 
 /** Create file system with the given parameters. */
-static int fat_blocks_write(struct fat_cfg const *cfg, service_id_t service_id)
+static errno_t fat_blocks_write(struct fat_cfg const *cfg, service_id_t service_id)
 {
 	aoff64_t addr;
@@ -362,5 +362,5 @@
 	int i;
 	uint32_t j;
-	int rc;
+	errno_t rc;
 	struct fat_bs bs;
 	fat_dentry_t *de;