Changeset 46577995 in mainline for uspace/srv/bd/file_bd/file_bd.c

Timestamp:

2018-01-04T20:50:52Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Children:

e211ea04

Parents:

facacc71

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-04 20:47:53)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-04 20:50:52)

Message:

Use errno_t in all uspace and kernel code.

Change type of every variable, parameter and return value that holds an
<errno.h> constant to either errno_t (the usual case), or sys_errno_t
(some places in kernel). This is for the purpose of self-documentation,
as well as for type-checking with a bit of type definition hackery.

After this commit, HelenOS is free of code that mixes error codes with non-error
values on the assumption that error codes are negative.

File:

• uspace/srv/bd/file_bd/file_bd.c (modified) (10 diffs)

uspace/srv/bd/file_bd/file_bd.c

@@ -67 +67 @@
 
 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 +88 @@
 int main(int argc, char **argv)
 {
-        int rc;
+        errno_t rc;
         char *image_name;
         char *device_name;
@@ -167 +167 @@
 }
 
-static int file_bd_init(const char *fname)
+static errno_t file_bd_init(const char *fname)
 {
         bd_srvs_init(&bd_srvs);
@@ -173 +173 @@
         
         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 +207 @@
 
 /** 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 +213 @@
 
 /** Close device. */
-static int file_bd_close(bd_srv_t *bd)
+static errno_t file_bd_close(bd_srv_t *bd)
 {
         return EOK;
@@ -219 +219 @@
 
 /** 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 +259 @@
 
 /** 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 +301 @@
 
 /** 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 +308 @@
 
 /** 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;