Changeset 5b3394c in mainline

Timestamp:

2012-04-23T21:54:49Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

8219eb9

Parents:

c2b0e10

Message:

libc: move gmtime() from libposix to libc

Location:

uspace/lib

Files:

• c/generic/time.c (modified) (1 diff)
• c/include/sys/time.h (modified) (1 diff)
• posix/time.c (modified) (1 diff)
• posix/time.h (modified) (2 diffs)

uspace/lib/c/generic/time.c

@@ -776 +776 @@
 }
 
+struct tm *gmtime(const time_t *timer)
+{
+        assert(timer != NULL);
+
+        static struct tm result;
+
+        /* Set result to epoch. */
+        result.tm_sec = 0;
+        result.tm_min = 0;
+        result.tm_hour = 0;
+        result.tm_mday = 1;
+        result.tm_mon = 0;
+        result.tm_year = 70; /* 1970 */
+
+        if (_normalize_time(&result, *timer) == -1) {
+                errno = EOVERFLOW;
+                return NULL;
+        }
+
+        return &result;
+
+}
+
 
 /** @}

uspace/lib/c/include/sys/time.h

@@ -77 +77 @@
 
 extern void udelay(useconds_t);
+
 extern time_t mktime(struct tm *tm);
+extern struct tm *gmtime(const time_t *timer);
 extern size_t strftime(char *restrict s, size_t maxsize,
     const char *restrict format, const struct tm *restrict tm);

uspace/lib/posix/time.c

@@ -324 +324 @@
 /**
  * Converts a time value to a broken-down UTC time.
- *
- * @param timer Time to convert.
- * @return Normalized broken-down time in UTC, NULL on overflow.
- */
-struct tm *posix_gmtime(const time_t *timer)
-{
-        assert(timer != NULL);
-
-        static struct tm result;
-        return posix_gmtime_r(timer, &result);
-}
-
-/**
- * Converts a time value to a broken-down UTC time.
  * 
  * @param timer Time to convert.

uspace/lib/posix/time.h

@@ -91 +91 @@
 
 /* Broken-down Time */
-extern struct tm *posix_gmtime(const time_t *timer);
 extern struct tm *posix_gmtime_r(const time_t *restrict timer,
     struct tm *restrict result);
@@ -130 +129 @@
         #define difftime posix_difftime
 
-        #define gmtime posix_gmtime
         #define gmtime_r posix_gmtime_r
         #define localtime posix_localtime