Index: uspace/app/mkexfat/mkexfat.c
===================================================================
--- uspace/app/mkexfat/mkexfat.c	(revision cde999aca79219e8751af76502001a86d411d176)
+++ uspace/app/mkexfat/mkexfat.c	(revision a0a9cc249adce31c755defdb6b74a991ebbf55ea)
@@ -112,9 +112,9 @@
 vbr_checksum_update(void const *octets, size_t nbytes, uint32_t *checksum);
 
-static int
+static errno_t
 ebs_write(service_id_t service_id, exfat_cfg_t *cfg,
     int base, uint32_t *chksum);
 
-static int
+static errno_t
 bitmap_write(service_id_t service_id, exfat_cfg_t *cfg);
 
@@ -284,5 +284,5 @@
 }
 
-static int
+static errno_t
 bootsec_write(service_id_t service_id, exfat_cfg_t *cfg)
 {
@@ -290,5 +290,5 @@
 	uint32_t vbr_checksum;
 	uint32_t *chksum_sector;
-	int rc;
+	errno_t rc;
 	unsigned idx;
 
@@ -346,5 +346,5 @@
  * @return  EOK on success or an error code.
  */
-static int
+static errno_t
 ebs_write(service_id_t service_id, exfat_cfg_t *cfg, int base,
     uint32_t *chksum)
@@ -352,5 +352,5 @@
 	uint32_t *ebs = calloc(cfg->sector_size, sizeof(uint8_t));
 	int i;
-	int rc;
+	errno_t rc;
 
 	if (!ebs)
@@ -399,10 +399,10 @@
  * @return EOK on success or an error code.
  */
-static int
+static errno_t
 fat_initialize(service_id_t service_id, exfat_cfg_t *cfg)
 {
 	unsigned long i;
 	uint32_t *pfat;
-	int rc;
+	errno_t rc;
 
 	pfat = calloc(cfg->sector_size, 1);
@@ -439,9 +439,9 @@
  * @return EOK on success or an error code.
  */
-static int
+static errno_t
 fat_allocate_clusters(service_id_t service_id, exfat_cfg_t *cfg,
     uint32_t cur_cls, unsigned long ncls)
 {
-	int rc;
+	errno_t rc;
 	unsigned const fat_entries = cfg->sector_size / sizeof(uint32_t);
 	aoff64_t fat_sec = cur_cls / fat_entries + FAT_SECTOR_START;
@@ -496,10 +496,10 @@
  * @return  EOK on success or an error code.
  */
-static int
+static errno_t
 bitmap_write(service_id_t service_id, exfat_cfg_t *cfg)
 {
 	unsigned long i, sec;
 	unsigned long allocated_cls;
-	int rc = EOK;
+	errno_t rc = EOK;
 	bool need_reset = true;
 
@@ -544,8 +544,8 @@
 
 /** Write the upcase table to disk. */
-static int
+static errno_t
 upcase_table_write(service_id_t service_id, exfat_cfg_t *cfg)
 {
-	int rc = EOK;
+	errno_t rc = EOK;
 	aoff64_t start_sec, nsecs, i;
 	uint8_t *table_ptr;
@@ -595,5 +595,5 @@
  * @return   EOK on success or an error code.
  */
-static int
+static errno_t
 root_dentries_write(service_id_t service_id, exfat_cfg_t *cfg)
 {
@@ -601,5 +601,5 @@
 	aoff64_t rootdir_sec;
 	uint16_t wlabel[EXFAT_VOLLABEL_LEN + 1];
-	int rc;
+	errno_t rc;
 	uint8_t *data;
 	unsigned long i;
@@ -758,5 +758,5 @@
 	char *dev_path;
 	service_id_t service_id;
-	int rc;
+	errno_t rc;
 	int c, opt_ind;
 	aoff64_t user_fs_size = 0;