Changeset 5a6cc679 in mainline for uspace/app/bnchmark/bnchmark.c

Timestamp:

2018-01-31T02:21:24Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

File:

• uspace/app/bnchmark/bnchmark.c (modified) (4 diffs)

uspace/app/bnchmark/bnchmark.c

@@ -54 +54 @@
 #define MBYTE (1024*1024)
 
-typedef int(*measure_func_t)(void *);
+typedef errno_t(*measure_func_t)(void *);
 typedef unsigned long umseconds_t; /* milliseconds */
 
 static void syntax_print(void);
 
-static int measure(measure_func_t fn, void* data, umseconds_t *result)
+static errno_t measure(measure_func_t fn, void* data, umseconds_t *result)
 {
         struct timeval start_time;
         gettimeofday(&start_time, NULL);
         
-        int rc = fn(data);
+        errno_t rc = fn(data);
         if (rc != EOK) {
                 fprintf(stderr, "measured function failed\n");
@@ -79 +79 @@
 }
 
-static int sequential_read_file(void *data)
+static errno_t sequential_read_file(void *data)
 {
         char *path = (char *) data;
@@ -109 +109 @@
 }
 
-static int sequential_read_dir(void *data)
+static errno_t sequential_read_dir(void *data)
 {
         char *path = (char *) data;
@@ -131 +131 @@
 int main(int argc, char **argv)
 {
-        int rc;
+        errno_t rc;
         umseconds_t milliseconds_taken = 0;
         char *path = NULL;