From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/7580 Path: news.gmane.org!not-for-mail From: =?UTF-8?B?572X5YuH5YiaKFlvbmdnYW5nIEx1bykg?= Newsgroups: gmane.linux.lib.musl.general Subject: thread local should be used Date: Fri, 8 May 2015 15:36:40 +0800 Message-ID: Reply-To: musl@lists.openwall.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1431070641 4471 80.91.229.3 (8 May 2015 07:37:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 8 May 2015 07:37:21 +0000 (UTC) To: musl@lists.openwall.com Original-X-From: musl-return-7593-gllmg-musl=m.gmane.org@lists.openwall.com Fri May 08 09:37:21 2015 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by plane.gmane.org with smtp (Exim 4.69) (envelope-from ) id 1YqcqW-0000xU-2D for gllmg-musl@m.gmane.org; Fri, 08 May 2015 09:37:20 +0200 Original-Received: (qmail 16017 invoked by uid 550); 8 May 2015 07:37:16 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Original-Received: (qmail 15978 invoked from network); 8 May 2015 07:37:12 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:reply-to:from:date:message-id:subject:to:content-type :content-transfer-encoding; bh=cACIivo3y0Ov/kXfg1cJxD8w/a3Sw7dmyZFfvq4GwtI=; b=k6MQh0T2Gv4yQP9AB+Tuxri4vS9oiR/Y04qRGbwTLIfyYgNBs5bRqRMNDYz3urITso HPv8VXwWYj9SPsGw291GMaK3D8tJv3QT8jShmf0LtBkIqNo6B0vDXJKgPY9Ih7yS6jve aRxNjB8GT3e8zLSQMeFWwfBj/lCyFDG37ojE8SA4b+CZgaBHt3zuQsaPZQcoh/R893Su VZAPugs/nEJ5ndq4tsszph8+XTXLj3avS+hfKvBSK16dMvGbJfvBPJYuX7PvBmoPACnX b4P78fZQPQes8KxzhROg46YDpSvpG9ug3kUcAjOqgq9bPeWL2kNu6nzICQ0K2CeHDCxH FqqA== X-Received: by 10.43.133.137 with SMTP id hy9mr2642885icc.74.1431070620670; Fri, 08 May 2015 00:37:00 -0700 (PDT) Xref: news.gmane.org gmane.linux.lib.musl.general:7580 Archived-At: 218933012b1f0f052f91ac39ee5cc6daba99237d src/multibyte/mbrtowc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/multibyte/mbrtowc.c b/src/multibyte/mbrtowc.c index e7b3654..de8d5ae 100644 --- a/src/multibyte/mbrtowc.c +++ b/src/multibyte/mbrtowc.c @@ -8,15 +8,15 @@ #include #include "internal.h" +_Thread_local static mbstate_t internal_state; size_t mbrtowc(wchar_t *restrict wc, const char *restrict src, size_t n, mbstate_t *restrict st) { - static unsigned internal_state; unsigned c; const unsigned char *s =3D (const void *)src; const unsigned N =3D n; wchar_t dummy; - if (!st) st =3D (void *)&internal_state; + if (!st) st =3D &internal_state; c =3D *(unsigned *)st; if (!s) { --=20 =E6=AD=A4=E8=87=B4 =E7=A4=BC =E7=BD=97=E5=8B=87=E5=88=9A Yours sincerely, Yonggang Luo