gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 08:26:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

permit loads of leading whitespace for intValue and doubleValue

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@26982 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2008-10-28 18:39:20 +00:00
parent c9010d3ee0
commit cfa4cf97bc
2 changed files with 36 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2008-10-28 Richard Frith-Macdonald <rfm@gnu.org>
* Source/GSString.m: Cope with loads of leading space in
intValue and doubleValue.
2008-10-27 Richard Frith-Macdonald <rfm@gnu.org>
* Source/GSFormat.m: Fix possible problem when current unix locale

42
Source/GSString.m
View file

@ -1486,18 +1486,25 @@ extern BOOL GSScanDouble(unichar*, unsigned, double*);
static inline double
doubleValue_c(GSStr self)
{
if (self->_count == 0)
const char *ptr = (const char*)self->_contents.c;
const char *end = ptr + self->_count;
while (isspace(*ptr) && ptr < end)
{
ptr++;
}
if (ptr == end)
{
return 0.0;
}
else
{
unsigned l = self->_count < 32 ? self->_count : 32;
unichar buf[l];
unsigned l = (end - ptr) < 32 ? (end - ptr) : 31;
unichar buf[l+1];
unichar *b = buf;
double d = 0.0;
GSToUnicode(&b, &l, self->_contents.c, l, internalEncoding, 0, 0);
GSToUnicode(&b, &l, (const uint8_t*)ptr, l, internalEncoding, 0, 0);
GSScanDouble(b, l, &d);
return d;
}
@ -1957,16 +1964,23 @@ getCStringE_u(GSStr self, char *buffer, unsigned int maxLength,
static inline int
intValue_c(GSStr self)
{
if (self->_count == 0)
const char *ptr = (const char*)self->_contents.c;
const char *end = ptr + self->_count;
while (isspace(*ptr) && ptr < end)
{
ptr++;
}
if (ptr == end)
{
return 0;
}
else
{
unsigned len = self->_count < 32 ? self->_count : 31;
unsigned len = (end - ptr) < 32 ? (end - ptr) : 31;
char buf[len+1];
memcpy(buf, self->_contents.c, len);
memcpy(buf, ptr, len);
buf[len] = '\0';
return atol((const char*)buf);
}
@ -1975,18 +1989,24 @@ intValue_c(GSStr self)
static inline int
intValue_u(GSStr self)
{
if (self->_count == 0)
const unichar *ptr = self->_contents.u;
const unichar *end = ptr + self->_count;
while (isspace(*ptr) && ptr < end)
{
ptr++;
}
if (ptr == end)
{
return 0;
}
else
{
unsigned int l = self->_count < 32 ? self->_count : 31;
unsigned int l = (end - ptr) < 32 ? (end - ptr) : 31;
unsigned char buf[l+1];
unsigned char *b = buf;
GSFromUnicode(&b, &l, self->_contents.u, l, internalEncoding,
0, GSUniTerminate);
GSFromUnicode(&b, &l, ptr, l, internalEncoding, 0, GSUniTerminate);
return atol((const char*)buf);
}
}