From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 100583 invoked by alias); 13 Mar 2018 21:09:44 -0000 Mailing-List: contact newlib-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: newlib-cvs-owner@sourceware.org Received: (qmail 100175 invoked by uid 9078); 13 Mar 2018 21:09:43 -0000 Date: Tue, 13 Mar 2018 21:09:00 -0000 Message-ID: <20180313210943.100170.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] towctrans_l: Always return a value from helper functions X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/master X-Git-Oldrev: 5b97e36239d0c9b9404b46571e6ad962b59fcbfe X-Git-Newrev: e186dc86615039fe6a2d8db514d792a3375b367d X-SW-Source: 2018-q1/txt/msg00054.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=e186dc86615039fe6a2d8db514d792a3375b367d commit e186dc86615039fe6a2d8db514d792a3375b367d Author: Corinna Vinschen Date: Tue Mar 13 22:09:30 2018 +0100 towctrans_l: Always return a value from helper functions touupper and toulower didn't return a value in all cases. Worse, this only broke Cygwin when building without optimization for debug purposes. Why GCC neglects to notice this is a mystery. While at it, fix formatting. Signed-off-by: Corinna Vinschen Diff: --- newlib/libc/ctype/towctrans_l.c | 68 +++++++++++++++++++++++++++++------------ 1 file changed, 49 insertions(+), 19 deletions(-) diff --git a/newlib/libc/ctype/towctrans_l.c b/newlib/libc/ctype/towctrans_l.c index 8da372f..eaabd8c 100644 --- a/newlib/libc/ctype/towctrans_l.c +++ b/newlib/libc/ctype/towctrans_l.c @@ -20,7 +20,7 @@ caseconv_table [] = { /* auxiliary function for binary search in interval properties table */ static const struct caseconv_entry * -bisearch(wint_t ucs, const struct caseconv_entry *table, int max) +bisearch (wint_t ucs, const struct caseconv_entry *table, int max) { int min = 0; int mid; @@ -46,17 +46,32 @@ toulower (wint_t c) const struct caseconv_entry * cce = bisearch(c, caseconv_table, sizeof(caseconv_table) / sizeof(*caseconv_table) - 1); + if (cce) - switch (cce->mode) { - case TOLO: return c + cce->delta; - case TOBOTH: return c + 1; - case TO1: switch (cce->delta) { - case EVENCAP: if (!(c & 1)) return c + 1; break; - case ODDCAP: if (c & 1) return c + 1; break; + switch (cce->mode) + { + case TOLO: + return c + cce->delta; + case TOBOTH: + return c + 1; + case TO1: + switch (cce->delta) + { + case EVENCAP: + if (!(c & 1)) + return c + 1; + break; + case ODDCAP: + if (c & 1) + return c + 1; + break; + default: + break; + } + default: + break; } - } - else - return c; + return c; } static wint_t @@ -65,17 +80,32 @@ touupper (wint_t c) const struct caseconv_entry * cce = bisearch(c, caseconv_table, sizeof(caseconv_table) / sizeof(*caseconv_table) - 1); + if (cce) - switch (cce->mode) { - case TOUP: return c + cce->delta; - case TOBOTH: return c - 1; - case TO1: switch (cce->delta) { - case EVENCAP: if (c & 1) return c - 1; break; - case ODDCAP: if (!(c & 1)) return c - 1; break; + switch (cce->mode) + { + case TOUP: + return c + cce->delta; + case TOBOTH: + return c - 1; + case TO1: + switch (cce->delta) + { + case EVENCAP: + if (c & 1) + return c - 1; + break; + case ODDCAP: + if (!(c & 1)) + return c - 1; + break; + default: + break; + } + default: + break; } - } - else - return c; + return c; } wint_t