Changeset f6cb995 in mainline

Timestamp:

2012-04-23T22:23:05Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

56b308e

Parents:

8219eb9

Message:

libc: move localtime() from libposix to libc

Location:

uspace/lib

Files:

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

uspace/lib/c/generic/time.c

@@ -798 +798 @@
 
         return &result;
-
 }
 
@@ -833 +832 @@
 }
 
+/**
+ * Converts a time value to a broken-down local time.
+ *
+ * @param timer Time to convert.
+ * @return Normalized broken-down time in local timezone, NULL on overflow.
+ */
+struct tm *localtime(const time_t *timer)
+{
+        // TODO: deal with timezone
+        // currently assumes system and all times are in GMT
+
+        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

@@ -82 +82 @@
 extern struct tm *gmtime(const time_t *timer);
 extern char *asctime(const struct tm *timeptr);
+extern struct tm *localtime(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

@@ -353 +353 @@
 /**
  * Converts a time value to a broken-down local time.
- *
- * @param timer Time to convert.
- * @return Normalized broken-down time in local timezone, NULL on overflow.
- */
-struct tm *posix_localtime(const time_t *timer)
-{
-        static struct tm result;
-        return posix_localtime_r(timer, &result);
-}
-
-/**
- * Converts a time value to a broken-down local time.
  * 
  * @param timer Time to convert.
@@ -419 +407 @@
 char *posix_ctime(const time_t *timer)
 {
-        struct tm *loctime = posix_localtime(timer);
+        struct tm *loctime = localtime(timer);
         if (loctime == NULL) {
                 return NULL;

uspace/lib/posix/time.h

@@ -90 +90 @@
 extern struct tm *posix_gmtime_r(const time_t *restrict timer,
     struct tm *restrict result);
-extern struct tm *posix_localtime(const time_t *timer);
 extern struct tm *posix_localtime_r(const time_t *restrict timer,
     struct tm *restrict result);
@@ -126 +125 @@
 
         #define gmtime_r posix_gmtime_r
-        #define localtime posix_localtime
         #define localtime_r posix_localtime_r