gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-29 16:01:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

simplification, including use of strtoull() everywhere

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@35503 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2012-09-03 13:36:45 +00:00
parent d2401da38c
commit 0be505308d
33 changed files with 41 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Source/NSString.m
View file

@ -46,12 +46,6 @@
#define GS_UNSAFE_REGEX 1
#import "common.h"
#include <stdio.h>
#include <string.h>
/* OpenBSD recommends impodring stdlib but not malloc.h for malloc */
#ifdef HAVE_STDLIB_H
# include <stdlib.h>
#endif
#import "Foundation/NSAutoreleasePool.h"
#import "Foundation/NSCalendarDate.h"
@ -3351,11 +3345,7 @@ static UCollator *GSICUCollatorOpen(NSStringCompareOptions mask, NSLocale *local
{
uint64_t v;
#if defined(__MINGW__)
v = _strtoui64(ptr, 0, 10);
#else
v = strtoul(ptr, 0, 10);
#endif
return (int)v;
}
}
@ -3376,11 +3366,7 @@ static UCollator *GSICUCollatorOpen(NSStringCompareOptions mask, NSLocale *local
{
uint64_t v;
#if defined(__MINGW__)
v = _strtoui64(ptr, 0, 10);
#else
v = strtoull(ptr, 0, 10);
#endif
v = (uint64_t)strtoull(ptr, 0, 10);
return (NSInteger)v;
}
}
@ -3401,11 +3387,7 @@ static UCollator *GSICUCollatorOpen(NSStringCompareOptions mask, NSLocale *local
{
unsigned long long l;
#if defined(__MINGW__)
l = _strtoui64(ptr, 0, 10);
#else
l = strtoull(ptr, 0, 10);
#endif
return (long long)l;
}
}