提交 0a37d995 编写于 作者: R Rich Felker

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.
上级 f5dfb45f
#include <locale.h>
#include <time.h>
size_t strftime_l(char *restrict s, size_t n, const char *restrict f, const struct tm *restrict tm, locale_t l)
{
return strftime(s, n, f, tm);
}
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <langinfo.h> #include <langinfo.h>
#include <locale.h>
#include <time.h> #include <time.h>
#include <limits.h> #include <limits.h>
#include "libc.h"
// FIXME: integer overflows // FIXME: integer overflows
...@@ -42,7 +44,7 @@ static int week_num(const struct tm *tm) ...@@ -42,7 +44,7 @@ static int week_num(const struct tm *tm)
return val; 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; nl_item item;
int val; int val;
...@@ -209,3 +211,10 @@ recu_strftime: ...@@ -209,3 +211,10 @@ recu_strftime:
s[l] = 0; s[l] = 0;
return l; 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);
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册