Changeset 56b308e in mainline

Timestamp:

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

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

d3e3a71

Parents:

f6cb995

Message:

libc: move ctime() 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

@@ -861 +861 @@
 }
 
+/**
+ * Equivalent to asctime(localtime(clock)).
+ * 
+ * @param timer Time to convert.
+ * @return Pointer to a statically allocated string holding the date.
+ */
+char *ctime(const time_t *timer)
+{
+        struct tm *loctime = localtime(timer);
+        if (loctime == NULL) {
+                return NULL;
+        }
+        return asctime(loctime);
+}
+
 /** @}
  */

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

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

@@ -400 +400 @@
 
 /**
- * Equivalent to asctime(localtime(clock)).
- * 
- * @param timer Time to convert.
- * @return Pointer to a statically allocated string holding the date.
- */
-char *posix_ctime(const time_t *timer)
-{
-        struct tm *loctime = localtime(timer);
-        if (loctime == NULL) {
-                return NULL;
-        }
-        return asctime(loctime);
-}
-
-/**
  * Reentrant variant of ctime().
  * 

uspace/lib/posix/time.h

@@ -96 +96 @@
 extern char *posix_asctime_r(const struct tm *restrict timeptr,
     char *restrict buf);
-extern char *posix_ctime(const time_t *timer);
 extern char *posix_ctime_r(const time_t *timer, char *buf);
 
@@ -128 +127 @@
 
         #define asctime_r posix_asctime_r
-        #define ctime posix_ctime
         #define ctime_r posix_ctime_r