Changeset b7fd2a0 in mainline for uspace/lib/pcut

Timestamp:

2018-01-13T03:10:29Z (8 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/lib/pcut

Files:

• include/pcut/asserts.h (modified) (2 diffs)
• src/os/helenos.c (modified) (4 diffs)
• tests/errno.c (modified) (1 diff)

uspace/lib/pcut/include/pcut/asserts.h

@@ -77 +77 @@
  * @param size Size of the buffer.
  */
-void pcut_str_error(int error, char *buffer, int size);
+void pcut_str_error(errno_t error, char *buffer, int size);
 
 /** Raise assertion error (internal version).
@@ -264 +264 @@
 #define PCUT_ASSERT_ERRNO_VAL_WITH_NAME(expected_value, expected_quoted, actual_value) \
         do {\
-                int pcut_expected_eval = (expected_value); \
-                int pcut_actual_eval = (actual_value); \
+                errno_t pcut_expected_eval = (expected_value); \
+                errno_t pcut_actual_eval = (actual_value); \
                 if (pcut_expected_eval != pcut_actual_eval) { \
                         char pcut_expected_description[100]; \

uspace/lib/pcut/src/os/helenos.c

@@ -68 +68 @@
 }
 
-void pcut_str_error(int error, char *buffer, int size) {
+void pcut_str_error(errno_t error, char *buffer, int size) {
         const char *str = str_error(error);
         if (str == NULL) {
@@ -130 +130 @@
  * @return EOK Always.
  */
-static int test_timeout_handler_fibril(void *arg) {
+static errno_t test_timeout_handler_fibril(void *arg) {
         pcut_item_t *test = arg;
         int timeout_sec = pcut_get_test_timeout(test);
@@ -139 +139 @@
                 goto leave_no_kill;
         }
-        int rc = fibril_condvar_wait_timeout(&forced_termination_cv,
+        errno_t rc = fibril_condvar_wait_timeout(&forced_termination_cv,
                 &forced_termination_mutex, timeout_us);
         if (rc == ETIMEOUT) {
@@ -160 +160 @@
         snprintf(tempfile_name, PCUT_TEMP_FILENAME_BUFFER_SIZE - 1, "pcut_%lld.tmp", (unsigned long long) task_get_id());
         int tempfile;
-        int rc = vfs_lookup_open(tempfile_name, WALK_REGULAR | WALK_MAY_CREATE, MODE_READ | MODE_WRITE, &tempfile);
+        errno_t rc = vfs_lookup_open(tempfile_name, WALK_REGULAR | WALK_MAY_CREATE, MODE_READ | MODE_WRITE, &tempfile);
         if (rc != EOK) {
                 pcut_report_test_done(test, PCUT_OUTCOME_INTERNAL_ERROR, "Failed to create temporary file.", NULL, NULL);

uspace/lib/pcut/tests/errno.c

@@ -38 +38 @@
 
 PCUT_TEST(errno_value) {
-        int value = EOK;
+        errno_t value = EOK;
         PCUT_ASSERT_ERRNO_VAL(EOK, value);
         value = ENOENT;