Changeset 46577995 in mainline for uspace/app/tester

Timestamp:

2018-01-04T20:50:52Z (8 years ago)

Author:

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

Children:

e211ea04

Parents:

facacc71

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-04 20:47:53)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-04 20:50:52)

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.

After this commit, HelenOS is free of code that mixes error codes with non-error
values on the assumption that error codes are negative.

Location:

uspace/app/tester

Files:

• chardev/chardev1.c (modified) (3 diffs)
• hw/serial/serial1.c (modified) (3 diffs)
• ipc/ping_pong.c (modified) (1 diff)
• mm/common.c (modified) (1 diff)
• mm/mapping1.c (modified) (3 diffs)
• mm/pager1.c (modified) (1 diff)
• vfs/vfs1.c (modified) (1 diff)

uspace/app/tester/chardev/chardev1.c

@@ -47 +47 @@
         async_sess_t *sess;
         size_t nbytes;
-        int rc;
+        errno_t rc;
 
         TPRINTF("Test small transfer character device operations\n");
@@ -99 +99 @@
         async_sess_t *sess;
         size_t nbytes;
-        int rc;
+        errno_t rc;
 
         TPRINTF("Test large transfer character device operations\n");
@@ -151 +151 @@
         async_sess_t *sess;
         size_t nbytes;
-        int rc;
+        errno_t rc;
 
         TPRINTF("Test partially-successful character device operations\n");

uspace/app/tester/hw/serial/serial1.c

@@ -56 +56 @@
         serial_t *serial;
         chardev_t *chardev;
-        int rc;
+        errno_t rc;
         size_t nread;
         size_t nwritten;
@@ -63 +63 @@
                 cnt = DEFAULT_COUNT;
         else
-                switch (str_size_t(test_argv[0], NULL, 0, true, &cnt)) {
-                case EOK:
+                switch ((case_errno_t) str_size_t(test_argv[0], NULL, 0, true, &cnt)) {
+                case (case_errno_t) EOK:
                         break;
-                case EINVAL:
+                case (case_errno_t) EINVAL:
                         return "Invalid argument, unsigned integer expected";
-                case EOVERFLOW:
+                case (case_errno_t) EOVERFLOW:
                         return "Argument size overflow";
                 default:
@@ -75 +75 @@
         
         service_id_t svc_id;
-        int res = loc_service_get_id("devices/\\hw\\pci0\\00:01.0\\com1\\a",
+        errno_t res = loc_service_get_id("devices/\\hw\\pci0\\00:01.0\\com1\\a",
             &svc_id, IPC_FLAG_BLOCKING);
         if (res != EOK)

uspace/app/tester/ipc/ping_pong.c

@@ -55 +55 @@
                 size_t i;
                 for (i = 0; i < COUNT_GRANULARITY; i++) {
-                        int retval = ns_ping();
+                        errno_t retval = ns_ping();
                         
                         if (retval != EOK) {

uspace/app/tester/mm/common.c

@@ -371 +371 @@
         
         /* Free the memory */
-        int ret = as_area_destroy(area->addr);
+        errno_t ret = as_area_destroy(area->addr);
         if (ret != EOK)
                 error_flag = true;

uspace/app/tester/mm/mapping1.c

@@ -66 +66 @@
     verify_mapping((area), (page_count), (expected_rc), #expected_rc)
 
-static bool verify_mapping(void *area, int page_count, int expected_rc,
+static bool verify_mapping(void *area, int page_count, errno_t expected_rc,
     const char *expected_rc_str)
 {
@@ -73 +73 @@
         for (i = 0; i < page_count; i++) {
                 void *page_start = ((char *) area) + PAGE_SIZE * i;
-                int rc = as_get_physical_mapping(page_start, NULL);
+                errno_t rc = as_get_physical_mapping(page_start, NULL);
                 if (rc != expected_rc) {
                         TPRINTF("as_get_physical_mapping() = %s != %s\n",
@@ -85 +85 @@
 const char *test_mapping1(void)
 {
-        int rc;
+        errno_t rc;
         
         size_t buffer1_len = BUFFER1_PAGES * PAGE_SIZE;

uspace/app/tester/mm/pager1.c

@@ -45 +45 @@
 {
         size_t nwr;
-        int rc;
+        errno_t rc;
 
         TPRINTF("Creating temporary file...\n");

uspace/app/tester/vfs/vfs1.c

@@ -69 +69 @@
 {
         aoff64_t pos = 0;
-        int rc;
+        errno_t rc;
 
         rc = vfs_link_path(TEST_DIRECTORY, KIND_DIRECTORY, NULL);