From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 865DF3858D33; Wed, 1 Mar 2023 09:55:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 865DF3858D33 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1677664521; bh=gyQYbq4LgTgfr60ibvY9XtlAb9nKMKZJQUrZtqggXrY=; h=From:To:Subject:Date:From; b=QI3QliWahXVXtapnfnFidyFvTmIcBav5/g6xfDiN3KjviyKeIoFCwo+E2CfsDUcpe hqXzet3Q+ycBECImZZrPszX6ZsUfVokQlrvIFFhJGENdIg1xnQ2BtMd9DbevH+1p2Z d5ise5RfQDDUmuuTESPeGDEsnKRPvJQOui91VNUA= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin/main] Cygwin: wcitoascii: move to wchar.h as inline function X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/main X-Git-Oldrev: 0d2ad77c40b641ebe2965568945a622f3f6dbd5c X-Git-Newrev: 77883ac914939e3fd5b3001b78857a3d11942104 Message-Id: <20230301095521.865DF3858D33@sourceware.org> Date: Wed, 1 Mar 2023 09:55:21 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D77883ac9149= 39e3fd5b3001b78857a3d11942104 commit 77883ac914939e3fd5b3001b78857a3d11942104 Author: Corinna Vinschen AuthorDate: Wed Mar 1 10:34:41 2023 +0100 Commit: Corinna Vinschen CommitDate: Wed Mar 1 10:54:52 2023 +0100 Cygwin: wcitoascii: move to wchar.h as inline function =20 Signed-off-by: Corinna Vinschen Diff: --- winsup/cygwin/glob.cc | 6 ------ winsup/cygwin/local_includes/wchar.h | 8 ++++++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/winsup/cygwin/glob.cc b/winsup/cygwin/glob.cc index 63a07a930f06..0b85a147acb7 100644 --- a/winsup/cygwin/glob.cc +++ b/winsup/cygwin/glob.cc @@ -481,12 +481,6 @@ globtilde(const Char *pattern, Char *patbuf, size_t pa= tbuf_len, glob_t *pglob) return patbuf; } =20 -static void -wcitoascii(char *dst, wint_t *src) -{ - while ((*dst++ =3D *src++)); -} - /* * The main glob() routine: compiles the pattern (optionally processing * quotes), calls glob1() to do the real pattern matching, and finally diff --git a/winsup/cygwin/local_includes/wchar.h b/winsup/cygwin/local_inc= ludes/wchar.h index 3907732a260f..b09d014c04df 100644 --- a/winsup/cygwin/local_includes/wchar.h +++ b/winsup/cygwin/local_includes/wchar.h @@ -52,6 +52,14 @@ size_t wirtomb (char *, wint_t, mbstate_t *); a UTF-32 value. Defined in strfuncs.cc */ extern size_t mbrtowi (wint_t *, const char *, size_t, mbstate_t *); =20 +/* convert wint_t string to char string, but *only* if the string consists + entirely of ASCII chars */ +static inline void +wcitoascii(char *dst, wint_t *src) +{ + while ((*dst++ =3D *src++)); +} + /* like wcslen, just for wint_t */ static inline size_t wcilen (const wint_t *wcs)