Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-24 16:11:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

At day-of-week support to strftime()

Browse Source
This commit is contained in:
Gregory Nutt
2015-11-25 11:51:46 -06:00
parent 070d95d161
commit 064ef4f1fb
2 changed files with 41 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configs
+1 -1
Submodule configs updated: 98ebc3e0a5...c8d8045996
libc/time/lib_strftime.c
+40 -2
View File
@@ -70,7 +70,19 @@
* Private Data
****************************************************************************/
static const char * const g_abbrevmonthname[12] =
#ifdef CONFIG_TIME_EXTENDED
static const char * const g_abbrev_wdayname[7] =
{
"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
};
static const char * const g_wdayname[7] =
{
"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
};
#endif
static const char * const g_abbrev_monthname[12] =
{
"Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
@@ -169,6 +181,31 @@ size_t strftime(FAR char *s, size_t max, FAR const char *format,
switch (*format++)
{
#ifdef CONFIG_TIME_EXTENDED
/* %a: A three-letter abbreviation for the day of the week. */
case 'a':
{
if (tm->tm_wday < 7)
{
str = g_abbrev_wdayname[tm->tm_wday];
len = snprintf(dest, chleft, "%s", str);
}
}
break;
/* %A: The full name for the day of the week. */
case 'A':
{
if (tm->tm_wday < 7)
{
str = g_wdayname[tm->tm_wday];
len = snprintf(dest, chleft, "%s", str);
}
}
break;
#else
/* %a: A three-letter abbreviation for the day of the week. */
/* %A: The full name for the day of the week. */
@@ -178,6 +215,7 @@ size_t strftime(FAR char *s, size_t max, FAR const char *format,
len = snprintf(dest, chleft, "Day"); /* Not supported */
}
break;
#endif
/* %h: Equivalent to %b */
@@ -189,7 +227,7 @@ size_t strftime(FAR char *s, size_t max, FAR const char *format,
{
if (tm->tm_mon < 12)
{
str = g_abbrevmonthname[tm->tm_mon];
str = g_abbrev_monthname[tm->tm_mon];
len = snprintf(dest, chleft, "%s", str);
}
}