From: Andreas Schwab <schwab@redhat.com>
To: libc-hacker@sourceware.org
Subject: [PATCH] Fix undefined reference to _nl_C_locobj_ptr
Date: Fri, 12 Aug 2011 14:06:00 -0000 [thread overview]
Message-ID: <m3k4airagu.fsf@hase.home> (raw)
2011-08-12 Andreas Schwab <schwab@redhat.com>
* intl/l10nflist.c (_nl_normalize_codeset): Fix last change.
---
intl/l10nflist.c | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/intl/l10nflist.c b/intl/l10nflist.c
index 82af263..b3a59e6 100644
--- a/intl/l10nflist.c
+++ b/intl/l10nflist.c
@@ -334,13 +334,20 @@ _nl_normalize_codeset (codeset, name_len)
char *retval;
char *wp;
size_t cnt;
+ locale_t locale;
+
+#if NOT_IN_libc
+ locale = newlocale (0, "C", NULL);
+#else
+ locale = _nl_C_locobj_ptr;
+#endif
for (cnt = 0; cnt < name_len; ++cnt)
- if (__isalnum_l ((unsigned char) codeset[cnt], _nl_C_locobj_ptr))
+ if (__isalnum_l ((unsigned char) codeset[cnt], locale))
{
++len;
- if (__isalpha_l ((unsigned char) codeset[cnt], _nl_C_locobj_ptr))
+ if (__isalpha_l ((unsigned char) codeset[cnt], locale))
only_digit = 0;
}
@@ -354,14 +361,18 @@ _nl_normalize_codeset (codeset, name_len)
wp = retval;
for (cnt = 0; cnt < name_len; ++cnt)
- if (__isalpha_l ((unsigned char) codeset[cnt], _nl_C_locobj_ptr))
+ if (__isalpha_l ((unsigned char) codeset[cnt], locale))
*wp++ = tolower ((unsigned char) codeset[cnt]);
- else if (__isdigit_l ((unsigned char) codeset[cnt], _nl_C_locobj_ptr))
+ else if (__isdigit_l ((unsigned char) codeset[cnt], locale))
*wp++ = codeset[cnt];
*wp = '\0';
}
+#if NOT_IN_libc
+ freelocale (locale);
+#endif
+
return (const char *) retval;
}
--
1.7.6
--
Andreas Schwab, schwab@redhat.com
GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84 5EC7 45C6 250E 6F00 984E
"And now for something completely different."
reply other threads:[~2011-08-12 14:06 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m3k4airagu.fsf@hase.home \
--to=schwab@redhat.com \
--cc=libc-hacker@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).