gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 00:11:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

A couple of locale fixes

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@17167 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2003-07-07 09:05:53 +00:00
parent 55aa234ddb
commit afb5488c8b
6 changed files with 229 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Source/GSString.m
View file

@ -1004,21 +1004,25 @@ dataUsingEncoding_u(ivars self, NSStringEncoding encoding, BOOL flag)
}
}
extern BOOL GSScanDouble(unichar*, unsigned, double*);
static inline double
doubleValue_c(ivars self)
{
if (self->_count == 0)
{
return 0;
return 0.0;
}
else
{
unsigned len = self->_count < 32 ? self->_count : 31;
unsigned char buf[len+1];
unsigned l = self->_count < 32 ? self->_count : 32;
unichar buf[l];
unichar *b = buf;
double d = 0.0;
memcpy(buf, self->_contents.c, len);
buf[len] = '\0';
return atof(buf);
GSToUnicode(&b, &l, self->_contents.c, l, intEnc, 0, 0);
GSScanDouble(b, l, &d);
return d;
}
}
@ -1027,16 +1031,14 @@ doubleValue_u(ivars self)
{
if (self->_count == 0)
{
return 0;
return 0.0;
}
else
{
unsigned int l = self->_count < 10 ? self->_count : 9;
unsigned char buf[l+1];
unsigned char *b = buf;
double d = 0.0;
GSFromUnicode(&b, &l, self->_contents.u, l, intEnc, 0, GSUniTerminate);
return atof(buf);
GSScanDouble(self->_contents.u, self->_count, &d);
return d;
}
}