Changeset 132ab5d1 in mainline for uspace/lib/posix/source/time.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/lib/posix/source/time.c (modified) (4 diffs)

uspace/lib/posix/source/time.c

@@ -41 +41 @@
 
 #include "posix/ctype.h"
-#include "posix/errno.h"
+
+#include <errno.h>
+
 #include "posix/signal.h"
 #include "posix/assert.h"
 
-#include "libc/fibril_synch.h"
+#include "libc/async.h"
 #include "libc/malloc.h"
 #include "libc/task.h"
@@ -100 +102 @@
     struct tm *restrict result)
 {
-        int rc = time_utc2tm(*timer, result);
-        if (rc != EOK) {
-                errno = rc;
+        if (failed(time_utc2tm(*timer, result))) {
                 return NULL;
         }
@@ -197 +197 @@
 char *posix_ctime_r(const time_t *timer, char *buf)
 {
-        int r = time_local2str(*timer, buf);
-        if (r != EOK) {
-                errno = r;
+        if (failed(time_local2str(*timer, buf))) {
                 return NULL;
         }
@@ -314 +312 @@
                         // TODO: interruptible sleep
                         if (rqtp->tv_sec != 0) {
-                                fibril_sleep(rqtp->tv_sec);
+                                async_sleep(rqtp->tv_sec);
                         }
                         if (rqtp->tv_nsec != 0) {
-                                fibril_usleep(rqtp->tv_nsec / 1000);
+                                async_usleep(rqtp->tv_nsec / 1000);
                         }
                         return 0;