Index: uspace/srv/bd/file_bd/file_bd.c
===================================================================
--- uspace/srv/bd/file_bd/file_bd.c	(revision 84a1a546f62a2ba0f913f8f1bfce8d4bc68d7aa4)
+++ uspace/srv/bd/file_bd/file_bd.c	(revision e211ea04fccf33d4cb2092f630a29e893e096a02)
@@ -67,13 +67,13 @@
 
 static void print_usage(void);
-static int file_bd_init(const char *fname);
+static errno_t file_bd_init(const char *fname);
 static void file_bd_connection(ipc_callid_t iid, ipc_call_t *icall, void *);
 
-static int file_bd_open(bd_srvs_t *, bd_srv_t *);
-static int file_bd_close(bd_srv_t *);
-static int file_bd_read_blocks(bd_srv_t *, aoff64_t, size_t, void *, size_t);
-static int file_bd_write_blocks(bd_srv_t *, aoff64_t, size_t, const void *, size_t);
-static int file_bd_get_block_size(bd_srv_t *, size_t *);
-static int file_bd_get_num_blocks(bd_srv_t *, aoff64_t *);
+static errno_t file_bd_open(bd_srvs_t *, bd_srv_t *);
+static errno_t file_bd_close(bd_srv_t *);
+static errno_t file_bd_read_blocks(bd_srv_t *, aoff64_t, size_t, void *, size_t);
+static errno_t file_bd_write_blocks(bd_srv_t *, aoff64_t, size_t, const void *, size_t);
+static errno_t file_bd_get_block_size(bd_srv_t *, size_t *);
+static errno_t file_bd_get_num_blocks(bd_srv_t *, aoff64_t *);
 
 static bd_ops_t file_bd_ops = {
@@ -88,5 +88,5 @@
 int main(int argc, char **argv)
 {
-	int rc;
+	errno_t rc;
 	char *image_name;
 	char *device_name;
@@ -167,5 +167,5 @@
 }
 
-static int file_bd_init(const char *fname)
+static errno_t file_bd_init(const char *fname)
 {
 	bd_srvs_init(&bd_srvs);
@@ -173,5 +173,5 @@
 	
 	async_set_fallback_port_handler(file_bd_connection, NULL);
-	int rc = loc_server_register(NAME);
+	errno_t rc = loc_server_register(NAME);
 	if (rc != EOK) {
 		printf("%s: Unable to register driver.\n", NAME);
@@ -207,5 +207,5 @@
 
 /** Open device. */
-static int file_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
+static errno_t file_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
 {
 	return EOK;
@@ -213,5 +213,5 @@
 
 /** Close device. */
-static int file_bd_close(bd_srv_t *bd)
+static errno_t file_bd_close(bd_srv_t *bd)
 {
 	return EOK;
@@ -219,5 +219,5 @@
 
 /** Read blocks from the device. */
-static int file_bd_read_blocks(bd_srv_t *bd, uint64_t ba, size_t cnt, void *buf,
+static errno_t file_bd_read_blocks(bd_srv_t *bd, uint64_t ba, size_t cnt, void *buf,
     size_t size)
 {
@@ -259,5 +259,5 @@
 
 /** Write blocks to the device. */
-static int file_bd_write_blocks(bd_srv_t *bd, uint64_t ba, size_t cnt,
+static errno_t file_bd_write_blocks(bd_srv_t *bd, uint64_t ba, size_t cnt,
     const void *buf, size_t size)
 {
@@ -301,5 +301,5 @@
 
 /** Get device block size. */
-static int file_bd_get_block_size(bd_srv_t *bd, size_t *rsize)
+static errno_t file_bd_get_block_size(bd_srv_t *bd, size_t *rsize)
 {
 	*rsize = block_size;
@@ -308,5 +308,5 @@
 
 /** Get number of blocks on device. */
-static int file_bd_get_num_blocks(bd_srv_t *bd, aoff64_t *rnb)
+static errno_t file_bd_get_num_blocks(bd_srv_t *bd, aoff64_t *rnb)
 {
 	*rnb = num_blocks;