Changes in uspace/lib/posix/time.c [86e81a9:f8b6d34c] in mainline

File:

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

uspace/lib/posix/time.c

@@ -200 +200 @@
  * @return Number of seconds since the epoch, not counting leap seconds.
  */
-static time_t _secs_since_epoch(const struct posix_tm *tm)
+static time_t _secs_since_epoch(const struct tm *tm)
 {
         return _days_since_epoch(tm->tm_year, tm->tm_mon, tm->tm_mday) *
@@ -229 +229 @@
  * @return 0 on success, -1 on overflow
  */
-static int _normalize_time(struct posix_tm *tm, time_t sec_add)
+static int _normalize_time(struct tm *tm, time_t sec_add)
 {
         // TODO: DST correction
@@ -324 +324 @@
  * @return Week-based year.
  */
-static int _wbyear(const struct posix_tm *tm)
+static int _wbyear(const struct tm *tm)
 {
         int day = tm->tm_yday - _wbyear_offset(tm->tm_year);
@@ -347 +347 @@
  * @return The week number (0 - 53).
  */
-static int _sun_week_number(const struct posix_tm *tm)
+static int _sun_week_number(const struct tm *tm)
 {
         int first_day = (7 - _day_of_week(tm->tm_year, 0, 1)) % 7;
@@ -363 +363 @@
  * @return The week number (1 - 53).
  */
-static int _iso_week_number(const struct posix_tm *tm)
+static int _iso_week_number(const struct tm *tm)
 {
         int day = tm->tm_yday - _wbyear_offset(tm->tm_year);
@@ -386 +386 @@
  * @return The week number (0 - 53).
  */
-static int _mon_week_number(const struct posix_tm *tm)
+static int _mon_week_number(const struct tm *tm)
 {
         int first_day = (1 - _day_of_week(tm->tm_year, 0, 1)) % 7;
@@ -430 +430 @@
  * @return time_t representation of the time, undefined value on overflow.
  */
-time_t posix_mktime(struct posix_tm *tm)
+time_t posix_mktime(struct tm *tm)
 {
         // TODO: take DST flag into account
@@ -445 +445 @@
  * @return Normalized broken-down time in UTC, NULL on overflow.
  */
-struct posix_tm *posix_gmtime(const time_t *timer)
+struct tm *posix_gmtime(const time_t *timer)
 {
         assert(timer != NULL);
 
-        static struct posix_tm result;
+        static struct tm result;
         return posix_gmtime_r(timer, &result);
 }
@@ -460 +460 @@
  * @return Value of result on success, NULL on overflow.
  */
-struct posix_tm *posix_gmtime_r(const time_t *restrict timer,
-    struct posix_tm *restrict result)
+struct tm *posix_gmtime_r(const time_t *restrict timer,
+    struct tm *restrict result)
 {
         assert(timer != NULL);
@@ -488 +488 @@
  * @return Normalized broken-down time in local timezone, NULL on overflow.
  */
-struct posix_tm *posix_localtime(const time_t *timer)
-{
-        static struct posix_tm result;
+struct tm *posix_localtime(const time_t *timer)
+{
+        static struct tm result;
         return posix_localtime_r(timer, &result);
 }
@@ -501 +501 @@
  * @return Value of result on success, NULL on overflow.
  */
-struct posix_tm *posix_localtime_r(const time_t *restrict timer,
-    struct posix_tm *restrict result)
+struct tm *posix_localtime_r(const time_t *restrict timer,
+    struct tm *restrict result)
 {
         // TODO: deal with timezone
@@ -516 +516 @@
  * @return Pointer to a statically allocated string.
  */
-char *posix_asctime(const struct posix_tm *timeptr)
+char *posix_asctime(const struct tm *timeptr)
 {
         static char buf[ASCTIME_BUF_LEN];
@@ -531 +531 @@
  * @return Value of buf.
  */
-char *posix_asctime_r(const struct posix_tm *restrict timeptr,
+char *posix_asctime_r(const struct tm *restrict timeptr,
     char *restrict buf)
 {
@@ -563 +563 @@
 char *posix_ctime(const time_t *timer)
 {
-        struct posix_tm *loctime = posix_localtime(timer);
+        struct tm *loctime = posix_localtime(timer);
         if (loctime == NULL) {
                 return NULL;
@@ -580 +580 @@
 char *posix_ctime_r(const time_t *timer, char *buf)
 {
-        struct posix_tm loctime;
+        struct tm loctime;
         if (posix_localtime_r(timer, &loctime) == NULL) {
                 return NULL;
@@ -598 +598 @@
  */
 size_t posix_strftime(char *restrict s, size_t maxsize,
-    const char *restrict format, const struct posix_tm *restrict tm)
+    const char *restrict format, const struct tm *restrict tm)
 {
         assert(s != NULL);