summaryrefslogtreecommitdiffstats
path: root/lib/libc/locale/toupper.c
diff options
context:
space:
mode:
authortjr <tjr@FreeBSD.org>2004-06-23 07:01:44 +0000
committertjr <tjr@FreeBSD.org>2004-06-23 07:01:44 +0000
commitd04fd4700f3a09552b35dfa53c683d0404754383 (patch)
treed89ed2a150bbb4fcdbff69b2c14d5d87b5dfbdfe /lib/libc/locale/toupper.c
parent663370f9413d6ac8d722e85a009c71e6c321fdc0 (diff)
downloadFreeBSD-src-d04fd4700f3a09552b35dfa53c683d0404754383.zip
FreeBSD-src-d04fd4700f3a09552b35dfa53c683d0404754383.tar.gz
Prefix the names of members of _RuneLocale and its sub-structures
with ``__'' to avoid polluting the namespace. This doesn't change the documented rune interface at all, but breaks applications that accessed _RuneLocale directly.
Diffstat (limited to 'lib/libc/locale/toupper.c')
-rw-r--r--lib/libc/locale/toupper.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/libc/locale/toupper.c b/lib/libc/locale/toupper.c
index b83365d..5ceaab4 100644
--- a/lib/libc/locale/toupper.c
+++ b/lib/libc/locale/toupper.c
@@ -45,19 +45,19 @@ ___toupper(c)
__ct_rune_t c;
{
size_t lim;
- _RuneRange *rr = &_CurrentRuneLocale->mapupper_ext;
+ _RuneRange *rr = &_CurrentRuneLocale->__mapupper_ext;
_RuneEntry *base, *re;
if (c < 0 || c == EOF)
return(c);
/* Binary search -- see bsearch.c for explanation. */
- base = rr->ranges;
- for (lim = rr->nranges; lim != 0; lim >>= 1) {
+ base = rr->__ranges;
+ for (lim = rr->__nranges; lim != 0; lim >>= 1) {
re = base + (lim >> 1);
- if (re->min <= c && c <= re->max)
- return (re->map + c - re->min);
- else if (c > re->max) {
+ if (re->__min <= c && c <= re->__max)
+ return (re->__map + c - re->__min);
+ else if (c > re->__max) {
base = re + 1;
lim--;
}
OpenPOWER on IntegriCloud