From d67a6ce4a8768ee356dbde15662095aef775e6b9 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Sun, 14 Feb 2010 21:28:44 +0000 Subject: [PATCH] * regex/regcomp.c (xwcrtomb): Fix one explicable and one inexcplicable C warning. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/regex/regcomp.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 452d2facc..7682cf1dd 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2010-02-14 Christopher Faylor + + * regex/regcomp.c (xwcrtomb): Fix one explicable and one inexcplicable + C warning. + 2010-02-13 Corinna Vinschen * regex/regcomp.c (xwcrtomb): Don't convert Unicode chars outside the diff --git a/winsup/cygwin/regex/regcomp.c b/winsup/cygwin/regex/regcomp.c index 98459e0e3..5aee63948 100644 --- a/winsup/cygwin/regex/regcomp.c +++ b/winsup/cygwin/regex/regcomp.c @@ -1175,8 +1175,8 @@ xwcrtomb (char *s, wint_t wc, mbstate_t *ps) code isn't surrogate pair aware, so we handle this here. Convert value to UTF-16 surrogate and call wcsrtombs to convert the "string" to the correct multibyte representation, if any. */ - wchar_t ws[2], *wsp = ws; - size_t n; + wchar_t ws[2]; + const wchar_t *wsp = ws; wc -= 0x10000; ws[0] = 0xd800 | (wc >> 10);