Changeset b7fd2a0 in mainline for uspace/srv/hid/compositor/compositor.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/srv/hid/compositor/compositor.c (modified) (17 diffs)

uspace/srv/hid/compositor/compositor.c

@@ -151 +151 @@
 static bool active = false;
 
-static int comp_active(input_t *);
-static int comp_deactive(input_t *);
-static int comp_key_press(input_t *, kbd_event_type_t, keycode_t, keymod_t, wchar_t);
-static int comp_mouse_move(input_t *, int, int);
-static int comp_abs_move(input_t *, unsigned, unsigned, unsigned, unsigned);
-static int comp_mouse_button(input_t *, int, int);
+static errno_t comp_active(input_t *);
+static errno_t comp_deactive(input_t *);
+static errno_t comp_key_press(input_t *, kbd_event_type_t, keycode_t, keymod_t, wchar_t);
+static errno_t comp_mouse_move(input_t *, int, int);
+static errno_t comp_abs_move(input_t *, unsigned, unsigned, unsigned, unsigned);
+static errno_t comp_mouse_button(input_t *, int, int);
 
 static input_ev_ops_t input_ev_ops = {
@@ -602 +602 @@
         }
         
-        int rc = async_data_read_finalize(callid, event, len);
+        errno_t rc = async_data_read_finalize(callid, event, len);
         if (rc != EOK) {
                 async_answer_0(iid, ENOMEM);
@@ -706 +706 @@
         
         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);
@@ -1049 +1049 @@
         /* Retrieve the mode that shall be set. */
         vslmode_t new_mode;
-        int rc = visualizer_get_mode(vp->sess, &new_mode, mode_idx);
+        errno_t rc = visualizer_get_mode(vp->sess, &new_mode, mode_idx);
         if (rc != EOK) {
                 fibril_mutex_unlock(&viewport_list_mtx);
@@ -1177 +1177 @@
 static async_sess_t *vsl_connect(service_id_t sid, const char *svc)
 {
-        int rc;
+        errno_t rc;
         async_sess_t *sess;
 
@@ -1206 +1206 @@
 static viewport_t *viewport_create(service_id_t sid)
 {
-        int rc;
+        errno_t rc;
         char *vsl_name = NULL;
         viewport_t *vp = NULL;
@@ -1477 +1477 @@
 #endif
 
-static int comp_abs_move(input_t *input, unsigned x , unsigned y,
+static errno_t comp_abs_move(input_t *input, unsigned x , unsigned y,
     unsigned max_x, unsigned max_y)
 {
@@ -1512 +1512 @@
 }
 
-static int comp_mouse_move(input_t *input, int dx, int dy)
+static errno_t comp_mouse_move(input_t *input, int dx, int dy)
 {
         pointer_t *pointer = input_pointer(input);
@@ -1624 +1624 @@
 }
 
-static int comp_mouse_button(input_t *input, int bnum, int bpress)
+static errno_t comp_mouse_button(input_t *input, int bnum, int bpress)
 {
         pointer_t *pointer = input_pointer(input);
@@ -1809 +1809 @@
 }
 
-static int comp_active(input_t *input)
+static errno_t comp_active(input_t *input)
 {
         active = true;
@@ -1817 +1817 @@
 }
 
-static int comp_deactive(input_t *input)
+static errno_t comp_deactive(input_t *input)
 {
         active = false;
@@ -1823 +1823 @@
 }
 
-static int comp_key_press(input_t *input, kbd_event_type_t type, keycode_t key,
+static errno_t comp_key_press(input_t *input, kbd_event_type_t type, keycode_t key,
     keymod_t mods, wchar_t c)
 {
@@ -2143 +2143 @@
 }
 
-static int input_connect(const char *svc)
+static errno_t input_connect(const char *svc)
 {
         async_sess_t *sess;
         service_id_t dsid;
 
-        int rc = loc_service_get_id(svc, &dsid, 0);
+        errno_t rc = loc_service_get_id(svc, &dsid, 0);
         if (rc != EOK) {
                 printf("%s: Input service %s not found\n", NAME, svc);
@@ -2199 +2199 @@
         /* Create viewports and connect them to visualizers. */
         category_id_t cat_id;
-        int rc = loc_category_get_id("visualizer", &cat_id, IPC_FLAG_BLOCKING);
+        errno_t rc = loc_category_get_id("visualizer", &cat_id, IPC_FLAG_BLOCKING);
         if (rc != EOK)
                 goto ret;
@@ -2240 +2240 @@
 }
 
-static int compositor_srv_init(char *input_svc, char *name)
+static errno_t compositor_srv_init(char *input_svc, char *name)
 {
         /* Coordinates of the central pixel. */
@@ -2251 +2251 @@
         async_set_fallback_port_handler(client_connection, NULL);
         
-        int rc = loc_server_register(NAME);
+        errno_t rc = loc_server_register(NAME);
         if (rc != EOK) {
                 printf("%s: Unable to register server (%s)\n", NAME, str_error(rc));
@@ -2313 +2313 @@
         printf("%s: HelenOS Compositor server\n", NAME);
         
-        int rc = compositor_srv_init(argv[1], argv[2]);
+        errno_t rc = compositor_srv_init(argv[1], argv[2]);
         if (rc != EOK)
                 return rc;