Changeset b412168 in mainline for uspace/app/testread/testread.c

Timestamp:

2014-11-17T03:25:04Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

6069061

Parents:

ef3da5a (diff), 5042706 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

File:

• uspace/app/testread/testread.c (modified) (3 diffs)

uspace/app/testread/testread.c

@@ -123 +123 @@
         struct timeval prev_time;
         struct timeval start_time;
-        int rc;
-        rc = gettimeofday(&start_time, NULL);
-        if (rc != EOK) {
-                printf("gettimeofday failed\n");
-                fclose(file);
-                free(buf);
-                return 1;
-        }
+        gettimeofday(&start_time, NULL);
         prev_time = start_time;
         
@@ -155 +148 @@
                 if (progress && offset >= next_mark) {
                         struct timeval cur_time;
-                        rc = gettimeofday(&cur_time, NULL);
-                        if (rc != EOK) {
-                                printf("gettimeofday failed\n");
-                                fclose(file);
-                                free(buf);
-                                return 1;
-                        }
+                        gettimeofday(&cur_time, NULL);
+                        
                         uint32_t last_run = cur_time.tv_sec - prev_time.tv_sec;
                         uint32_t total_time = cur_time.tv_sec - start_time.tv_sec;
@@ -178 +166 @@
         
         struct timeval final_time;
-        rc = gettimeofday(&final_time, NULL);
-        if (rc != EOK) {
-                printf("gettimeofday failed\n");
-                fclose(file);
-                free(buf);
-                return 1;
-        }
+        gettimeofday(&final_time, NULL);
         
         uint32_t total_run_time = final_time.tv_sec - start_time.tv_sec;