drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

newlib: strftime: fix gcc warning on __ctloc 

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2018-08-07 15:20:29 +02:00
parent dedeea9965
commit 0283642f35
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
newlib/libc/time/strftime.c
View File

@ -294,7 +294,7 @@ locale, hard-coding the "C" locale settings.
# define CHAR char /* string type basis */ # define CHAR char /* string type basis */
# define CQ(a) a /* character constant qualifier */ # define CQ(a) a /* character constant qualifier */
# define SFLG /* %s flag (null for normal char) */ # define SFLG /* %s flag (null for normal char) */
# define _ctloc(x) (ctloclen = strlen (ctloc = _CurrentTimeLocale->x), ctloc) # define _ctloc(x) (ctloclen = strlen (ctloc = _CurrentTimeLocale->x))
# define snprintf sniprintf /* avoid to pull in FP functions. */ # define snprintf sniprintf /* avoid to pull in FP functions. */
# define TOLOWER(c) tolower((int)(unsigned char)(c)) # define TOLOWER(c) tolower((int)(unsigned char)(c))
# define STRTOUL(c,p,b) strtoul((c),(p),(b)) # define STRTOUL(c,p,b) strtoul((c),(p),(b))
@ -315,8 +315,7 @@ locale, hard-coding the "C" locale settings.
# define STRLEN(a) wcslen(a) # define STRLEN(a) wcslen(a)
# define SFLG "l" /* %s flag (l for wide char) */ # define SFLG "l" /* %s flag (l for wide char) */
# ifdef __HAVE_LOCALE_INFO_EXTENDED__ # ifdef __HAVE_LOCALE_INFO_EXTENDED__
# define _ctloc(x) (ctloclen = wcslen (ctloc = _CurrentTimeLocale->w##x), \ # define _ctloc(x) (ctloclen = wcslen (ctloc = _CurrentTimeLocale->w##x))
ctloc)
# else # else
# define CTLOCBUFLEN 256 /* Arbitrary big buffer size */ # define CTLOCBUFLEN 256 /* Arbitrary big buffer size */
const wchar_t * const wchar_t *
@ -328,8 +327,7 @@ locale, hard-coding the "C" locale settings.
*len_ret = 0; *len_ret = 0;
return buf; return buf;
} }
# define _ctloc(x) (ctloc = __ctloc (ctlocbuf, _CurrentTimeLocale->x, \ # define _ctloc(x) (ctloc = __ctloc (ctlocbuf, _CurrentTimeLocale->x))
&ctloclen))
# endif # endif
#endif /* MAKE_WCSFTIME */ #endif /* MAKE_WCSFTIME */