41c41
< __FBSDID("$FreeBSD: head/lib/libc/locale/rune.c 101566 2002-08-09 08:22:29Z ache $");
---
> __FBSDID("$FreeBSD: head/lib/libc/locale/rune.c 130961 2004-06-23 07:01:44Z tjr $");
95c95
< rl->variable = rl + 1;
---
> rl->__variable = rl + 1;
97c97
< if (memcmp(rl->magic, _RUNE_MAGIC_1, sizeof(rl->magic))) {
---
> if (memcmp(rl->__magic, _RUNE_MAGIC_1, sizeof(rl->__magic))) {
103,107c103,107
< rl->invalid_rune = ntohl(rl->invalid_rune);
< rl->variable_len = ntohl(rl->variable_len);
< rl->runetype_ext.nranges = ntohl(rl->runetype_ext.nranges);
< rl->maplower_ext.nranges = ntohl(rl->maplower_ext.nranges);
< rl->mapupper_ext.nranges = ntohl(rl->mapupper_ext.nranges);
---
> rl->__invalid_rune = ntohl(rl->__invalid_rune);
> rl->__variable_len = ntohl(rl->__variable_len);
> rl->__runetype_ext.__nranges = ntohl(rl->__runetype_ext.__nranges);
> rl->__maplower_ext.__nranges = ntohl(rl->__maplower_ext.__nranges);
> rl->__mapupper_ext.__nranges = ntohl(rl->__mapupper_ext.__nranges);
110,112c110,112
< rl->runetype[x] = ntohl(rl->runetype[x]);
< rl->maplower[x] = ntohl(rl->maplower[x]);
< rl->mapupper[x] = ntohl(rl->mapupper[x]);
---
> rl->__runetype[x] = ntohl(rl->__runetype[x]);
> rl->__maplower[x] = ntohl(rl->__maplower[x]);
> rl->__mapupper[x] = ntohl(rl->__mapupper[x]);
115,117c115,118
< rl->runetype_ext.ranges = (_RuneEntry *)rl->variable;
< rl->variable = rl->runetype_ext.ranges + rl->runetype_ext.nranges;
< if (rl->variable > lastp) {
---
> rl->__runetype_ext.__ranges = (_RuneEntry *)rl->__variable;
> rl->__variable = rl->__runetype_ext.__ranges +
> rl->__runetype_ext.__nranges;
> if (rl->__variable > lastp) {
123,125c124,127
< rl->maplower_ext.ranges = (_RuneEntry *)rl->variable;
< rl->variable = rl->maplower_ext.ranges + rl->maplower_ext.nranges;
< if (rl->variable > lastp) {
---
> rl->__maplower_ext.__ranges = (_RuneEntry *)rl->__variable;
> rl->__variable = rl->__maplower_ext.__ranges +
> rl->__maplower_ext.__nranges;
> if (rl->__variable > lastp) {
131,133c133,136
< rl->mapupper_ext.ranges = (_RuneEntry *)rl->variable;
< rl->variable = rl->mapupper_ext.ranges + rl->mapupper_ext.nranges;
< if (rl->variable > lastp) {
---
> rl->__mapupper_ext.__ranges = (_RuneEntry *)rl->__variable;
> rl->__variable = rl->__mapupper_ext.__ranges +
> rl->__mapupper_ext.__nranges;
> if (rl->__variable > lastp) {
139,140c142,143
< for (x = 0; x < rl->runetype_ext.nranges; ++x) {
< rr = rl->runetype_ext.ranges;
---
> for (x = 0; x < rl->__runetype_ext.__nranges; ++x) {
> rr = rl->__runetype_ext.__ranges;
142,148c145,151
< rr[x].min = ntohl(rr[x].min);
< rr[x].max = ntohl(rr[x].max);
< if ((rr[x].map = ntohl(rr[x].map)) == 0) {
< int len = rr[x].max - rr[x].min + 1;
< rr[x].types = rl->variable;
< rl->variable = rr[x].types + len;
< if (rl->variable > lastp) {
---
> rr[x].__min = ntohl(rr[x].__min);
> rr[x].__max = ntohl(rr[x].__max);
> if ((rr[x].__map = ntohl(rr[x].__map)) == 0) {
> int len = rr[x].__max - rr[x].__min + 1;
> rr[x].__types = rl->__variable;
> rl->__variable = rr[x].__types + len;
> if (rl->__variable > lastp) {
154c157
< rr[x].types[len] = ntohl(rr[x].types[len]);
---
> rr[x].__types[len] = ntohl(rr[x].__types[len]);
156c159
< rr[x].types = 0;
---
> rr[x].__types = 0;
159,160c162,163
< for (x = 0; x < rl->maplower_ext.nranges; ++x) {
< rr = rl->maplower_ext.ranges;
---
> for (x = 0; x < rl->__maplower_ext.__nranges; ++x) {
> rr = rl->__maplower_ext.__ranges;
162,164c165,167
< rr[x].min = ntohl(rr[x].min);
< rr[x].max = ntohl(rr[x].max);
< rr[x].map = ntohl(rr[x].map);
---
> rr[x].__min = ntohl(rr[x].__min);
> rr[x].__max = ntohl(rr[x].__max);
> rr[x].__map = ntohl(rr[x].__map);
167,168c170,171
< for (x = 0; x < rl->mapupper_ext.nranges; ++x) {
< rr = rl->mapupper_ext.ranges;
---
> for (x = 0; x < rl->__mapupper_ext.__nranges; ++x) {
> rr = rl->__mapupper_ext.__ranges;
170,172c173,175
< rr[x].min = ntohl(rr[x].min);
< rr[x].max = ntohl(rr[x].max);
< rr[x].map = ntohl(rr[x].map);
---
> rr[x].__min = ntohl(rr[x].__min);
> rr[x].__max = ntohl(rr[x].__max);
> rr[x].__map = ntohl(rr[x].__map);
174c177
< if (((char *)rl->variable) + rl->variable_len > (char *)lastp) {
---
> if (((char *)rl->__variable) + rl->__variable_len > (char *)lastp) {
183,184c186,187
< if (!rl->variable_len)
< rl->variable = 0;
---
> if (!rl->__variable_len)
> rl->__variable = 0;
186,187c189,190
< if (!rl->runetype_ext.nranges)
< rl->runetype_ext.ranges = 0;
---
> if (!rl->__runetype_ext.__nranges)
> rl->__runetype_ext.__ranges = 0;
189,190c192,193
< if (!rl->maplower_ext.nranges)
< rl->maplower_ext.ranges = 0;
---
> if (!rl->__maplower_ext.__nranges)
> rl->__maplower_ext.__ranges = 0;
192,193c195,196
< if (!rl->mapupper_ext.nranges)
< rl->mapupper_ext.ranges = 0;
---
> if (!rl->__mapupper_ext.__nranges)
> rl->__mapupper_ext.__ranges = 0;