Changeset 98b1d30 in mainline

Timestamp:

2018-02-03T10:52:17Z (7 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5c69377

Parents:

be01eb3

Message:

tmon: refactor to errno_t

Location:

uspace/app/tmon

Files:

• list.c (modified) (1 diff)
• resolve.h (modified) (1 diff)
• tests.c (modified) (3 diffs)
• tf.c (modified) (1 diff)
• tf.h (modified) (1 diff)

uspace/app/tmon/list.c

@@ -49 +49 @@
 static void print_list_item(service_id_t svc)
 {
-        int rc;
+        errno_t rc;
         devman_handle_t diag_handle = 0;
 

uspace/app/tmon/resolve.h

@@ -39 +39 @@
 #include <devman.h>
 
-int tmon_resolve_default(devman_handle_t *);
-int tmon_resolve_named(const char *, devman_handle_t *);
+errno_t tmon_resolve_default(devman_handle_t *);
+errno_t tmon_resolve_named(const char *, devman_handle_t *);
 
 #endif /* TMON_RESOLVE_H_ */

uspace/app/tmon/tests.c

@@ -66 +66 @@
  * @return EOK if successful (in such case caller becomes the owner of `params`).
  */
-static int read_params(int argc, char *argv[], void **params)
-{
-        int rc;
+static errno_t read_params(int argc, char *argv[], void **params)
+{
+        errno_t rc;
         usbdiag_test_params_t *p = (usbdiag_test_params_t *) malloc(sizeof(usbdiag_test_params_t));
         if (!p)
@@ -182 +182 @@
 
         usbdiag_test_results_t results;
-        int rc = usbdiag_test_in(exch, params, &results);
+        errno_t rc = usbdiag_test_in(exch, params, &results);
         if (rc != EOK) {
                 puts("failed\n");
@@ -207 +207 @@
 
         usbdiag_test_results_t results;
-        int rc = usbdiag_test_out(exch, params, &results);
+        errno_t rc = usbdiag_test_out(exch, params, &results);
         if (rc) {
                 puts("failed\n");

uspace/app/tmon/tf.c

@@ -67 +67 @@
         }
 
-        int rc, ec;
+        errno_t rc;
+        int ec;
         char path[MAX_PATH_LENGTH];
         if ((rc = devman_fun_get_path(fun, path, sizeof(path)))) {

uspace/app/tmon/tf.h

@@ -42 +42 @@
 /** Operations to implement by all tests. */
 typedef struct tmon_test_ops {
-        int (*pre_run)(void *);
-        int (*run)(async_exch_t *, const void *);
-        int (*read_params)(int, char **, void **);
+        errno_t (*pre_run)(void *);
+        errno_t (*run)(async_exch_t *, const void *);
+        errno_t (*read_params)(int, char **, void **);
 } tmon_test_ops_t;