[newlib-cygwin] newlib: strftime: fix gcc warning on __ctloc

[newlib-cygwin] newlib: strftime: fix gcc warning on __ctloc

[Corinna Vinschen]

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=0283642f35ce019589a6263b7eb0646776fca157

commit 0283642f35ce019589a6263b7eb0646776fca157
Author: Corinna Vinschen <corinna@vinschen.de>
Date:   Tue Aug 7 15:20:29 2018 +0200

    newlib: strftime: fix gcc warning on __ctloc
    
    Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

Diff:
---
 newlib/libc/time/strftime.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/newlib/libc/time/strftime.c b/newlib/libc/time/strftime.c
index 3e5e268..0cb3123 100644
--- a/newlib/libc/time/strftime.c
+++ b/newlib/libc/time/strftime.c
@@ -294,7 +294,7 @@ locale, hard-coding the "C" locale settings.
 #  define CHAR		char		/* string type basis */
 #  define CQ(a)		a		/* character constant qualifier */
 #  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 TOLOWER(c)	tolower((int)(unsigned char)(c))
 #  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 SFLG		"l"		/* %s flag (l for wide char) */
 #  ifdef __HAVE_LOCALE_INFO_EXTENDED__
-#   define _ctloc(x) (ctloclen = wcslen (ctloc = _CurrentTimeLocale->w##x), \
-		      ctloc)
+#   define _ctloc(x)    (ctloclen = wcslen (ctloc = _CurrentTimeLocale->w##x))
 #  else
 #   define CTLOCBUFLEN   256		/* Arbitrary big buffer size */
     const wchar_t *
@@ -328,8 +327,7 @@ locale, hard-coding the "C" locale settings.
 	*len_ret = 0;
       return buf;
     }
-#   define _ctloc(x) (ctloc = __ctloc (ctlocbuf, _CurrentTimeLocale->x, \
-		      &ctloclen))
+#   define _ctloc(x)    (ctloc = __ctloc (ctlocbuf, _CurrentTimeLocale->x))
 #  endif
 #endif  /* MAKE_WCSFTIME */