Changeset b7fd2a0 in mainline for uspace/srv/devman

Timestamp:

2018-01-13T03:10:29Z (7 years ago)

Author:

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

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a53ed3a

Parents:

36f0738

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.

Although this is a massive commit, it is a simple text replacement, and thus
is very easy to verify. Simply do the following:

`
git checkout <this commit's hash>
git reset HEAD
<sup>git add .
tools/srepl '\berrno_t\b' int
git add .
tools/srepl '\bsys_errno_t\b' sysarg_t
git reset
git diff
`</sup>

While this doesn't ensure that the replacements are correct, it does ensure
that the commit doesn't do anything except those replacements. Since errno_t
is typedef'd to int in the usual case (and sys_errno_t to sysarg_t), even if
incorrect, this commit cannot change behavior.

Location:

uspace/srv/devman

Files:

• client_conn.c (modified) (12 diffs)
• dev.c (modified) (1 diff)
• dev.h (modified) (1 diff)
• driver.c (modified) (9 diffs)
• driver.h (modified) (2 diffs)
• drv_conn.c (modified) (11 diffs)
• fun.c (modified) (3 diffs)
• fun.h (modified) (1 diff)
• loc.c (modified) (1 diff)
• loc.h (modified) (1 diff)
• main.c (modified) (1 diff)
• match.c (modified) (1 diff)

uspace/srv/devman/client_conn.c

@@ -66 +66 @@
         devman_handle_t handle;
         
-        int rc = async_data_write_accept((void **) &pathname, true, 0, 0, 0, 0);
+        errno_t rc = async_data_write_accept((void **) &pathname, true, 0, 0, 0, 0);
         if (rc != EOK) {
                 async_answer_0(iid, rc);
@@ -363 +363 @@
         size_t size;
         size_t act_size;
-        int rc;
+        errno_t rc;
         
         if (!async_data_read_receive(&callid, &size)) {
@@ -400 +400 @@
         fibril_rwlock_read_unlock(&device_tree.rwlock);
         
-        int retval = async_data_read_finalize(callid, hdl_buf, size);
+        errno_t retval = async_data_read_finalize(callid, hdl_buf, size);
         free(hdl_buf);
         
@@ -440 +440 @@
 {
         fun_node_t *fun;
-        int rc;
+        errno_t rc;
 
         fun = find_fun_node(&device_tree, IPC_GET_ARG1(*icall));
@@ -465 +465 @@
 {
         fun_node_t *fun;
-        int rc;
+        errno_t rc;
 
         fun = find_fun_node(&device_tree, IPC_GET_ARG1(*icall));
@@ -511 +511 @@
         size_t size;
         size_t act_size;
-        int rc;
+        errno_t rc;
         
         if (!async_data_read_receive(&callid, &size)) {
@@ -532 +532 @@
         }
         
-        int retval = async_data_read_finalize(callid, hdl_buf, size);
+        errno_t retval = async_data_read_finalize(callid, hdl_buf, size);
         free(hdl_buf);
         
@@ -543 +543 @@
         size_t size;
         size_t act_size;
-        int rc;
+        errno_t rc;
         
         if (!async_data_read_receive(&callid, &size)) {
@@ -572 +572 @@
         }
         
-        int retval = async_data_read_finalize(callid, hdl_buf, size);
+        errno_t retval = async_data_read_finalize(callid, hdl_buf, size);
         free(hdl_buf);
         
@@ -584 +584 @@
         char *drvname;
         
-        int rc = async_data_write_accept((void **) &drvname, true, 0, 0, 0, 0);
+        errno_t rc = async_data_write_accept((void **) &drvname, true, 0, 0, 0, 0);
         if (rc != EOK) {
                 async_answer_0(iid, rc);
@@ -711 +711 @@
 {
         driver_t *drv;
-        int rc;
+        errno_t rc;
         
         drv = driver_find(&drivers_list, IPC_GET_ARG1(*icall));
@@ -730 +730 @@
 {
         driver_t *drv;
-        int rc;
+        errno_t rc;
         
         drv = driver_find(&drivers_list, IPC_GET_ARG1(*icall));

uspace/srv/devman/dev.c

@@ -127 +127 @@
 
 /** Get list of device functions. */
-int dev_get_functions(dev_tree_t *tree, dev_node_t *dev,
+errno_t dev_get_functions(dev_tree_t *tree, dev_node_t *dev,
     devman_handle_t *hdl_buf, size_t buf_size, size_t *act_size)
 {

uspace/srv/devman/dev.h

@@ -45 +45 @@
     devman_handle_t handle);
 extern dev_node_t *find_dev_node(dev_tree_t *tree, devman_handle_t handle);
-extern int dev_get_functions(dev_tree_t *tree, dev_node_t *, devman_handle_t *,
+extern errno_t dev_get_functions(dev_tree_t *tree, dev_node_t *, devman_handle_t *,
     size_t, size_t *);
 

uspace/srv/devman/driver.c

@@ -283 +283 @@
 bool start_driver(driver_t *drv)
 {
-        int rc;
+        errno_t rc;
 
         assert(fibril_mutex_is_locked(&drv->driver_mutex));
@@ -306 +306 @@
  *                      otherwise.
  */
-int stop_driver(driver_t *drv)
+errno_t stop_driver(driver_t *drv)
 {
         async_exch_t *exch;
-        int retval;
+        errno_t retval;
         
         log_msg(LOG_DEFAULT, LVL_DEBUG, "stop_driver(drv=\"%s\")", drv->name);
@@ -591 +591 @@
         
         /* Send the device name to the driver. */
-        int rc = async_data_write_start(exch, dev->pfun->name,
+        errno_t rc = async_data_write_start(exch, dev->pfun->name,
             str_size(dev->pfun->name) + 1);
         
@@ -618 +618 @@
 }
 
-int driver_dev_remove(dev_tree_t *tree, dev_node_t *dev)
+errno_t driver_dev_remove(dev_tree_t *tree, dev_node_t *dev)
 {
         async_exch_t *exch;
-        int retval;
+        errno_t retval;
         driver_t *drv;
         devman_handle_t handle;
@@ -641 +641 @@
 }
 
-int driver_dev_gone(dev_tree_t *tree, dev_node_t *dev)
+errno_t driver_dev_gone(dev_tree_t *tree, dev_node_t *dev)
 {
         async_exch_t *exch;
-        int retval;
+        errno_t retval;
         driver_t *drv;
         devman_handle_t handle;
@@ -664 +664 @@
 }
 
-int driver_fun_online(dev_tree_t *tree, fun_node_t *fun)
+errno_t driver_fun_online(dev_tree_t *tree, fun_node_t *fun)
 {
         async_exch_t *exch;
-        int retval;
+        errno_t retval;
         driver_t *drv;
         devman_handle_t handle;
@@ -692 +692 @@
 }
 
-int driver_fun_offline(dev_tree_t *tree, fun_node_t *fun)
+errno_t driver_fun_offline(dev_tree_t *tree, fun_node_t *fun)
 {
         async_exch_t *exch;
-        int retval;
+        errno_t retval;
         driver_t *drv;
         devman_handle_t handle;
@@ -721 +721 @@
 
 /** Get list of registered drivers. */
-int driver_get_list(driver_list_t *driver_list, devman_handle_t *hdl_buf,
+errno_t driver_get_list(driver_list_t *driver_list, devman_handle_t *hdl_buf,
     size_t buf_size, size_t *act_size)
 {
@@ -753 +753 @@
 
 /** Get list of device functions. */
-int driver_get_devices(driver_t *driver, devman_handle_t *hdl_buf,
+errno_t driver_get_devices(driver_t *driver, devman_handle_t *hdl_buf,
     size_t buf_size, size_t *act_size)
 {

uspace/srv/devman/driver.h

@@ -50 +50 @@
 extern void detach_driver(dev_tree_t *, dev_node_t *);
 extern bool start_driver(driver_t *);
-extern int stop_driver(driver_t *);
+extern errno_t stop_driver(driver_t *);
 extern void add_device(driver_t *, dev_node_t *, dev_tree_t *);
-extern int driver_dev_remove(dev_tree_t *, dev_node_t *);
-extern int driver_dev_gone(dev_tree_t *, dev_node_t *);
-extern int driver_fun_online(dev_tree_t *, fun_node_t *);
-extern int driver_fun_offline(dev_tree_t *, fun_node_t *);
+extern errno_t driver_dev_remove(dev_tree_t *, dev_node_t *);
+extern errno_t driver_dev_gone(dev_tree_t *, dev_node_t *);
+extern errno_t driver_fun_online(dev_tree_t *, fun_node_t *);
+extern errno_t driver_fun_offline(dev_tree_t *, fun_node_t *);
 
 extern driver_t *driver_find(driver_list_t *, devman_handle_t);
@@ -64 +64 @@
 extern void clean_driver(driver_t *);
 extern void delete_driver(driver_t *);
-extern int driver_get_list(driver_list_t *, devman_handle_t *, size_t, size_t *);
-extern int driver_get_devices(driver_t *, devman_handle_t *, size_t, size_t *);
+extern errno_t driver_get_list(driver_list_t *, devman_handle_t *, size_t, size_t *);
+extern errno_t driver_get_devices(driver_t *, devman_handle_t *, size_t, size_t *);
 
 #endif

uspace/srv/devman/drv_conn.c

@@ -61 +61 @@
 #include "main.h"
 
-static int init_running_drv(void *drv);
+static errno_t init_running_drv(void *drv);
 
 /** Register running driver. */
@@ -72 +72 @@
         
         /* Get driver name. */
-        int rc = async_data_write_accept((void **) &drv_name, true, 0, 0, 0, 0);
+        errno_t rc = async_data_write_accept((void **) &drv_name, true, 0, 0, 0, 0);
         if (rc != EOK) {
                 async_answer_0(callid, rc);
@@ -163 +163 @@
  * @return              Zero on success, error code otherwise.
  */
-static int devman_receive_match_id(match_id_list_t *match_ids)
+static errno_t devman_receive_match_id(match_id_list_t *match_ids)
 {
         match_id_t *match_id = create_match_id();
         ipc_callid_t callid;
         ipc_call_t call;
-        int rc = 0;
+        errno_t rc = 0;
         
         callid = async_get_call(&call);
@@ -213 +213 @@
  * @return              Zero on success, error code otherwise.
  */
-static int devman_receive_match_ids(sysarg_t match_count,
+static errno_t devman_receive_match_ids(sysarg_t match_count,
     match_id_list_t *match_ids)
 {
-        int ret = EOK;
+        errno_t ret = EOK;
         size_t i;
         
@@ -255 +255 @@
         
         char *fun_name = NULL;
-        int rc = async_data_write_accept((void **)&fun_name, true, 0, 0, 0, 0);
+        errno_t rc = async_data_write_accept((void **)&fun_name, true, 0, 0, 0, 0);
         if (rc != EOK) {
                 dev_del_ref(pdev);
@@ -332 +332 @@
         devman_handle_t handle = IPC_GET_ARG1(*call);
         category_id_t cat_id;
-        int rc;
+        errno_t rc;
         
         /* Get category name. */
@@ -381 +381 @@
 {
         fun_node_t *fun;
-        int rc;
+        errno_t rc;
         
         log_msg(LOG_DEFAULT, LVL_DEBUG, "devman_drv_fun_online()");
@@ -425 +425 @@
 {
         fun_node_t *fun;
-        int rc;
+        errno_t rc;
 
         fun = find_fun_node(&device_tree, IPC_GET_ARG1(*icall));
@@ -462 +462 @@
         devman_handle_t fun_handle = IPC_GET_ARG1(*call);
         dev_tree_t *tree = &device_tree;
-        int rc;
+        errno_t rc;
         
         fun_node_t *fun = find_fun_node(&device_tree, fun_handle);
@@ -490 +490 @@
                         dev_node_t *dev = fun->child;
                         device_state_t dev_state;
-                        int gone_rc;
+                        errno_t gone_rc;
                         
                         dev_add_ref(dev);
@@ -575 +575 @@
  * driver needed to be served by devman during the driver's initialization).
  */
-static int init_running_drv(void *drv)
+static errno_t init_running_drv(void *drv)
 {
         driver_t *driver = (driver_t *) drv;

uspace/srv/devman/fun.c

@@ -286 +286 @@
 }
 
-static int assign_driver_fibril(void *arg)
+static errno_t assign_driver_fibril(void *arg)
 {
         dev_node_t *dev_node = (dev_node_t *) arg;
@@ -296 +296 @@
 }
 
-int fun_online(fun_node_t *fun)
+errno_t fun_online(fun_node_t *fun)
 {
         dev_node_t *dev;
@@ -354 +354 @@
 }
 
-int fun_offline(fun_node_t *fun)
-{
-        int rc;
+errno_t fun_offline(fun_node_t *fun)
+{
+        errno_t rc;
         
         fibril_rwlock_write_lock(&device_tree.rwlock);

uspace/srv/devman/fun.h

@@ -49 +49 @@
     const char *);
 extern bool set_fun_path(dev_tree_t *, fun_node_t *, fun_node_t *);
-extern int fun_online(fun_node_t *);
-extern int fun_offline(fun_node_t *);
+extern errno_t fun_online(fun_node_t *);
+extern errno_t fun_offline(fun_node_t *);
 
 #endif

uspace/srv/devman/loc.c

@@ -67 +67 @@
 }
 
-int loc_unregister_tree_function(fun_node_t *fun, dev_tree_t *tree)
+errno_t loc_unregister_tree_function(fun_node_t *fun, dev_tree_t *tree)
 {
-        int rc = loc_service_unregister(fun->service_id);
+        errno_t rc = loc_service_unregister(fun->service_id);
         tree_rem_loc_function(tree, fun);
         return rc;

uspace/srv/devman/loc.h

@@ -39 +39 @@
 
 extern void loc_register_tree_function(fun_node_t *, dev_tree_t *);
-extern int loc_unregister_tree_function(fun_node_t *, dev_tree_t *);
+extern errno_t loc_unregister_tree_function(fun_node_t *, dev_tree_t *);
 extern fun_node_t *find_loc_tree_function(dev_tree_t *, service_id_t);
 extern void tree_add_loc_function(dev_tree_t *, fun_node_t *);

uspace/srv/devman/main.c

@@ -317 +317 @@
         printf("%s: HelenOS Device Manager\n", NAME);
         
-        int rc = log_init(NAME);
+        errno_t rc = log_init(NAME);
         if (rc != EOK) {
                 printf("%s: Error initializing logging subsystem: %s\n", NAME, str_error(rc));

uspace/srv/devman/match.c

@@ -202 +202 @@
         struct stat st;
         
-        int rc = vfs_lookup_open(conf_path, WALK_REGULAR, MODE_READ, &fd);
+        errno_t rc = vfs_lookup_open(conf_path, WALK_REGULAR, MODE_READ, &fd);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Unable to open `%s' for reading: %s.",