Changeset b7fd2a0 in mainline for uspace/lib/graph/graph.c

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.

File:

• uspace/lib/graph/graph.c (modified) (18 diffs)

uspace/lib/graph/graph.c

@@ -86 +86 @@
 }
 
-int graph_register_visualizer(visualizer_t *vs)
+errno_t graph_register_visualizer(visualizer_t *vs)
 {
         char node[LOC_NAME_MAXLEN + 1];
@@ -93 +93 @@
         
         category_id_t cat;
-        int rc = loc_category_get_id("visualizer", &cat, 0);
+        errno_t rc = loc_category_get_id("visualizer", &cat, 0);
         if (rc != EOK)
                 return rc;
@@ -114 +114 @@
 }
 
-int graph_register_renderer(renderer_t *rnd)
+errno_t graph_register_renderer(renderer_t *rnd)
 {
         char node[LOC_NAME_MAXLEN + 1];
@@ -121 +121 @@
         
         category_id_t cat;
-        int rc = loc_category_get_id("renderer", &cat, 0);
+        errno_t rc = loc_category_get_id("renderer", &cat, 0);
         if (rc != EOK)
                 return rc;
@@ -178 +178 @@
 }
 
-int graph_unregister_visualizer(visualizer_t *vs)
+errno_t graph_unregister_visualizer(visualizer_t *vs)
 {
         fibril_mutex_lock(&visualizer_list_mtx);
-        int rc = loc_service_unregister(vs->reg_svc_handle);
+        errno_t rc = loc_service_unregister(vs->reg_svc_handle);
         list_remove(&vs->link);
         fibril_mutex_unlock(&visualizer_list_mtx);
@@ -188 +188 @@
 }
 
-int graph_unregister_renderer(renderer_t *rnd)
+errno_t graph_unregister_renderer(renderer_t *rnd)
 {
         fibril_mutex_lock(&renderer_list_mtx);
-        int rc = loc_service_unregister(rnd->reg_svc_handle);
+        errno_t rc = loc_service_unregister(rnd->reg_svc_handle);
         list_remove(&rnd->link);
         fibril_mutex_unlock(&renderer_list_mtx);
@@ -219 +219 @@
 }
 
-int graph_notify_mode_change(async_sess_t *sess, sysarg_t handle, sysarg_t mode_idx)
+errno_t graph_notify_mode_change(async_sess_t *sess, sysarg_t handle, sysarg_t mode_idx)
 {
         async_exch_t *exch = async_exchange_begin(sess);
-        int ret = async_req_2_0(exch, VISUALIZER_MODE_CHANGE, handle, mode_idx);
+        errno_t ret = async_req_2_0(exch, VISUALIZER_MODE_CHANGE, handle, mode_idx);
         async_exchange_end(exch);
         
@@ -228 +228 @@
 }
 
-int graph_notify_disconnect(async_sess_t *sess, sysarg_t handle)
+errno_t graph_notify_disconnect(async_sess_t *sess, sysarg_t handle)
 {
         async_exch_t *exch = async_exchange_begin(sess);
-        int ret = async_req_1_0(exch, VISUALIZER_DISCONNECT, handle);
+        errno_t ret = async_req_1_0(exch, VISUALIZER_DISCONNECT, handle);
         async_exchange_end(exch);
         
@@ -242 +242 @@
 {
         vs->client_side_handle = IPC_GET_ARG1(*icall);
-        int rc = vs->ops.claim(vs);
+        errno_t rc = vs->ops.claim(vs);
         async_answer_0(iid, rc);
 }
@@ -257 +257 @@
         
         /* Driver might also deallocate resources for the current mode. */
-        int rc = vs->ops.yield(vs);
+        errno_t rc = vs->ops.yield(vs);
         
         /* Now that the driver was given a chance to deallocate resources,
@@ -285 +285 @@
                     list_get_instance(link, vslmode_list_element_t, link);
                 
-                int rc = async_data_read_finalize(callid, &mode_elem->mode, len);
+                errno_t rc = async_data_read_finalize(callid, &mode_elem->mode, len);
                 async_answer_0(iid, rc);
         } else {
@@ -317 +317 @@
         
         if (mode_elem != NULL) {
-                int rc = async_data_read_finalize(callid, &mode_elem->mode, len);
+                errno_t rc = async_data_read_finalize(callid, &mode_elem->mode, len);
                 async_answer_0(iid, rc);
         } else {
@@ -340 +340 @@
         
         if (vs->mode_set) {
-                int rc = async_data_read_finalize(callid, &vs->cur_mode, len);
+                errno_t rc = async_data_read_finalize(callid, &vs->cur_mode, len);
                 async_answer_0(iid, rc);
         } else {
@@ -372 +372 @@
         
         if (mode_elem != NULL) {
-                int rc = async_data_read_finalize(callid, &mode_elem->mode, len);
+                errno_t rc = async_data_read_finalize(callid, &mode_elem->mode, len);
                 async_answer_0(iid, rc);
         } else {
@@ -429 +429 @@
         
         void *new_cell_storage;
-        int rc = async_share_out_finalize(callid, &new_cell_storage);
+        errno_t rc = async_share_out_finalize(callid, &new_cell_storage);
         if ((rc != EOK) || (new_cell_storage == AS_MAP_FAILED)) {
                 async_answer_0(iid, ENOMEM);
@@ -472 +472 @@
         sysarg_t y_offset = (IPC_GET_ARG5(*icall) & 0x0000ffff);
         
-        int rc = vs->ops.handle_damage(vs,
+        errno_t rc = vs->ops.handle_damage(vs,
             IPC_GET_ARG1(*icall), IPC_GET_ARG2(*icall),
             IPC_GET_ARG3(*icall), IPC_GET_ARG4(*icall),
@@ -481 +481 @@
 static void vs_suspend(visualizer_t *vs, ipc_callid_t iid, ipc_call_t *icall)
 {
-        int rc = vs->ops.suspend(vs);
+        errno_t rc = vs->ops.suspend(vs);
         async_answer_0(iid, rc);
 }
@@ -487 +487 @@
 static void vs_wakeup(visualizer_t *vs, ipc_callid_t iid, ipc_call_t *icall)
 {
-        int rc = vs->ops.wakeup(vs);
+        errno_t rc = vs->ops.wakeup(vs);
         async_answer_0(iid, rc);
 }