Changeset 8219eb9 in mainline

Timestamp:

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

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

f6cb995

Parents:

5b3394c

Message:

libc: move asctime() from libposix to libc

Location:

uspace/lib

Files:

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

uspace/lib/c/generic/time.c

@@ -48 +48 @@
 #include <stdio.h>
 #include <ctype.h>
+
+#define ASCTIME_BUF_LEN 26
 
 /** Pointer to kernel shared variables with time */
@@ -799 +801 @@
 }
 
+/**
+ * Converts broken-down time to a string in format
+ * "Sun Jan 1 00:00:00 1970\n". (Obsolete)
+ *
+ * @param timeptr Broken-down time structure.
+ * @return Pointer to a statically allocated string.
+ */
+char *asctime(const struct tm *timeptr)
+{
+        static char buf[ASCTIME_BUF_LEN];
+
+        assert(timeptr != NULL);
+
+        static const char *wday[] = {
+                "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
+        };
+        static const char *mon[] = {
+                "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+                "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+        };
+
+        snprintf(buf, ASCTIME_BUF_LEN, "%s %s %2d %02d:%02d:%02d %d\n",
+            wday[timeptr->tm_wday],
+            mon[timeptr->tm_mon],
+            timeptr->tm_mday, timeptr->tm_hour,
+            timeptr->tm_min, timeptr->tm_sec,
+            1900 + timeptr->tm_year);
+
+        return buf;
+
+}
+
 
 /** @}

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

@@ -41 +41 @@
 
 #define DST_NONE 0
+#define ASCTIME_BUF_LEN 26
 
 typedef long time_t;
@@ -80 +81 @@
 extern time_t mktime(struct tm *tm);
 extern struct tm *gmtime(const time_t *timer);
+extern char *asctime(const struct tm *timeptr);
 extern size_t strftime(char *restrict s, size_t maxsize,
     const char *restrict format, const struct tm *restrict tm);

uspace/lib/posix/time.c

@@ -383 +383 @@
  *
  * @param timeptr Broken-down time structure.
- * @return Pointer to a statically allocated string.
- */
-char *posix_asctime(const struct tm *timeptr)
-{
-        static char buf[ASCTIME_BUF_LEN];
-        return posix_asctime_r(timeptr, buf);
-}
-
-/**
- * Converts broken-down time to a string in format
- * "Sun Jan 1 00:00:00 1970\n". (Obsolete)
- *
- * @param timeptr Broken-down time structure.
  * @param buf Buffer to store string to, must be at least ASCTIME_BUF_LEN
  *     bytes long.
@@ -436 +423 @@
                 return NULL;
         }
-        return posix_asctime(loctime);
+        return asctime(loctime);
 }
 

uspace/lib/posix/time.h

@@ -63 +63 @@
 #endif
 
-#undef ASCTIME_BUF_LEN
-#define ASCTIME_BUF_LEN 26
-
 #undef CLOCK_REALTIME
 #define CLOCK_REALTIME ((posix_clockid_t) 0)
@@ -98 +95 @@
 
 /* Formatting Calendar Time */
-extern char *posix_asctime(const struct tm *timeptr);
 extern char *posix_asctime_r(const struct tm *restrict timeptr,
     char *restrict buf);
@@ -133 +129 @@
         #define localtime_r posix_localtime_r
 
-        #define asctime posix_asctime
         #define asctime_r posix_asctime_r
         #define ctime posix_ctime