From b16127c6a3a05b948c92869dd28905472706583f Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 21 Feb 2011 05:07:14 +0100 Subject: [PATCH] mbrtowc: Tiny optimization. * lib/mbrtowc.c (mbrtowc): Delay pstate assignment until it is needed. --- ChangeLog | 5 +++++ lib/mbrtowc.c | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 289730afdc..dbdc5303b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-02-20 Bruno Haible + + mbrtowc: Tiny optimization. + * lib/mbrtowc.c (mbrtowc): Delay pstate assignment until it is needed. + 2011-02-20 Jim Meyering test-exclude.c: remove unmatched #endif diff --git a/lib/mbrtowc.c b/lib/mbrtowc.c index 0546f6db7a..d9c25cced6 100644 --- a/lib/mbrtowc.c +++ b/lib/mbrtowc.c @@ -40,9 +40,6 @@ mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) { char *pstate = (char *)ps; - if (pstate == NULL) - pstate = internal_state; - if (s == NULL) { pwc = NULL; @@ -54,6 +51,10 @@ mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) return (size_t)(-2); /* Here n > 0. */ + + if (pstate == NULL) + pstate = internal_state; + { size_t nstate = pstate[0]; char buf[4]; -- 2.30.2