From 0a37d99547b2a82880cdf8dd849f98ed39d179e1 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Wed, 24 Jul 2013 17:58:31 -0400 Subject: move strftime_l into strftime.c and add __-prefixed version the latter is both for ABI purposes, and to facilitate eventually adding LC_TIME support. it's also nice to eliminate an extra source file. --- src/time/strftime.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/time') diff --git a/src/time/strftime.c b/src/time/strftime.c index d16e8134..e377fff2 100644 --- a/src/time/strftime.c +++ b/src/time/strftime.c @@ -1,8 +1,10 @@ #include #include #include +#include #include #include +#include "libc.h" // FIXME: integer overflows @@ -42,7 +44,7 @@ static int week_num(const struct tm *tm) return val; } -size_t strftime(char *restrict s, size_t n, const char *restrict f, const struct tm *restrict tm) +size_t __strftime_l(char *restrict s, size_t n, const char *restrict f, const struct tm *restrict tm, locale_t loc) { nl_item item; int val; @@ -209,3 +211,10 @@ recu_strftime: s[l] = 0; return l; } + +size_t strftime(char *restrict s, size_t n, const char *restrict f, const struct tm *restrict tm) +{ + return __strftime_l(s, n, f, tm, LC_GLOBAL_LOCALE); +} + +weak_alias(__strftime_l, strftime_l); -- cgit v1.2.1