Changeset b7fd2a0 in mainline for uspace/lib/c/generic/clipboard.c

Timestamp:

2018-01-13T03:10:29Z (6 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/c/generic/clipboard.c (modified) (7 diffs)

uspace/lib/c/generic/clipboard.c

@@ -59 +59 @@
 {
         service_id_t sid;
-        int rc;
+        errno_t rc;
         
         fibril_mutex_lock(&clip_mutex);
@@ -98 +98 @@
  *
  */
-int clipboard_put_str(const char *str)
+errno_t clipboard_put_str(const char *str)
 {
         size_t size = str_size(str);
@@ -104 +104 @@
         if (size == 0) {
                 async_exch_t *exch = clip_exchange_begin();
-                int rc = async_req_1_0(exch, CLIPBOARD_PUT_DATA,
+                errno_t rc = async_req_1_0(exch, CLIPBOARD_PUT_DATA,
                     CLIPBOARD_TAG_NONE);
                 clip_exchange_end(exch);
                 
-                return (int) rc;
+                return (errno_t) rc;
         } else {
                 async_exch_t *exch = clip_exchange_begin();
                 aid_t req = async_send_1(exch, CLIPBOARD_PUT_DATA, CLIPBOARD_TAG_DATA,
                     NULL);
-                int rc = async_data_write_start(exch, (void *) str, size);
+                errno_t rc = async_data_write_start(exch, (void *) str, size);
                 clip_exchange_end(exch);
                 
                 if (rc != EOK) {
-                        int rc_orig;
+                        errno_t rc_orig;
                         async_wait_for(req, &rc_orig);
                         if (rc_orig == EOK)
-                                return (int) rc;
+                                return (errno_t) rc;
                         else
-                                return (int) rc_orig;
+                                return (errno_t) rc_orig;
                 }
                 
                 async_wait_for(req, &rc);
                 
-                return (int) rc;
+                return (errno_t) rc;
         }
 }
@@ -140 +140 @@
  *
  */
-int clipboard_get_str(char **str)
+errno_t clipboard_get_str(char **str)
 {
         /* Loop until clipboard read succesful */
@@ -148 +148 @@
                 sysarg_t size;
                 sysarg_t tag;
-                int rc = async_req_0_2(exch, CLIPBOARD_CONTENT, &size, &tag);
+                errno_t rc = async_req_0_2(exch, CLIPBOARD_CONTENT, &size, &tag);
                 
                 clip_exchange_end(exch);
                 
                 if (rc != EOK)
-                        return (int) rc;
+                        return (errno_t) rc;
                 
                 char *sbuf;
@@ -176 +176 @@
                         clip_exchange_end(exch);
                         
-                        if ((int) rc == EOVERFLOW) {
+                        if ((errno_t) rc == EOVERFLOW) {
                                 /*
                                  * The data in the clipboard has changed since
@@ -185 +185 @@
                         
                         if (rc != EOK) {
-                                int rc_orig;
+                                errno_t rc_orig;
                                 async_wait_for(req, &rc_orig);
                                 if (rc_orig == EOK)
-                                        return (int) rc;
+                                        return (errno_t) rc;
                                 else
-                                        return (int) rc_orig;
+                                        return (errno_t) rc_orig;
                         }