simplification, including use of strtoull() everywhere

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@35503 72102866-910b-0410-8b05-ffd578937521
2025-04-23 00:41:02 +00:00 · 2012-09-03 13:36:45 +00:00 · 2012-09-03 13:36:45 +00:00 · 0623c0c0c2
commit 0623c0c0c2
parent a553252cc9
33 changed files with 41 additions and 66 deletions
--- a/37
+++ b/37
@ -1,3 +1,40 @@
+2012-09-03  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source\NSTimeZone.m:
+	* Source\NSBundle.m:
+	* Source\NSPropertyList.m:
+	* Source\NSProcessInfo.m:
+	* Source\NSSocketPort.m:
+	* Source\NSRunLoop.m:
+	* Source\NSMessagePortNameServer.m:
+	* Source\NSDistributedLock.m:
+	* Source\GSHTTPURLHandle.m:
+	* Source\NSZone.m:
+	* Source\NSPage.m:
+	* Source\NSMessagePort.m:
+	* Source\NSUnarchiver.m:
+	* Source\win32\GSFileHandle.m:
+	* Source\NSFileManager.m:
+	* Source\common.h:
+	* Source\NSString.m:
+	* Source\Additions\NSData+GNUstepBase.m:
+	* Source\Additions\Unicode.m:
+	* Source\Additions\NSMutableString+GNUstepBase.m:
+	* Source\Additions\NSError+GNUstepBase.m:
+	* Source\Additions\GSMime.m:
+	* Source\Additions\NSString+GNUstepBase.m:
+	* Source\Additions\GCArray.m:
+	* Source\Additions\GSXML.m:
+	* Source\Additions\NSNumber+GNUstepBase.m:
+	* Source\Additions\GSObjCRuntime.m:
+	* Source\GSString.m:
+	* Source\NSObjCRuntime.m:
+	* Source\GSFormat.m:
+	* Source\GSFileHandle.m:
+	* Source\NSTask.m:
+	On windows with mingw we can use strtoull() rather than _strtoui64().
+	Also, remove redundant header includes since string.h is in common.h
+
 2012-09-03  Niels Grewe <niels.grewe@halbordnung.de>

 	* configure.ac: Fallback to the non icu-config check for ICU in
--- a/Source/Additions/GCArray.m
+++ b/Source/Additions/GCArray.m
@ -25,7 +25,6 @@
 */

 #import "common.h"
-#include <string.h>
 #ifndef NeXT_Foundation_LIBRARY
 #import "Foundation/NSException.h"
 #import "Foundation/NSRange.h"
--- a/Source/Additions/GSMime.m
+++ b/Source/Additions/GSMime.m
@ -82,7 +82,6 @@
  int			cState


-#include <string.h>
 #include <ctype.h>

 #import	"Foundation/NSArray.h"
--- a/Source/Additions/GSObjCRuntime.m
+++ b/Source/Additions/GSObjCRuntime.m
@ -51,7 +51,6 @@
 #include <objc/Protocol.h>

 #include <stdio.h>
-#include <string.h>
 #include <ctype.h>

 #ifndef NeXT_RUNTIME
--- a/Source/Additions/GSXML.m
+++ b/Source/Additions/GSXML.m
@ -46,7 +46,6 @@
 #ifndef	_XOPEN_SOURCE
 #define	_XOPEN_SOURCE 600
 #endif
-#include <string.h>
 #include <stdio.h>


--- a/Source/Additions/NSData+GNUstepBase.m
+++ b/Source/Additions/NSData+GNUstepBase.m
@ -29,7 +29,6 @@
 #import "GNUstepBase/NSData+GNUstepBase.h"
 #import "GNUstepBase/NSString+GNUstepBase.h"

-#include <string.h>
 #include <ctype.h>

 /**
--- a/Source/Additions/NSError+GNUstepBase.m
+++ b/Source/Additions/NSError+GNUstepBase.m
@ -37,11 +37,9 @@
 #else
 #define	_XOPEN_SOURCE 600
 #endif
-#include <string.h>

 #import "common.h"

-#include <errno.h>
 #include <stdio.h>

 #import "Foundation/NSDictionary.h"
--- a/Source/Additions/NSMutableString+GNUstepBase.m
+++ b/Source/Additions/NSMutableString+GNUstepBase.m
@ -23,7 +23,6 @@

 */
 #import "common.h"
-#include <string.h>
 #include <ctype.h>

 #import "Foundation/NSException.h"
--- a/Source/Additions/NSNumber+GNUstepBase.m
+++ b/Source/Additions/NSNumber+GNUstepBase.m
@ -24,7 +24,6 @@
 */
 #import "common.h"

-#include <string.h>
 #include <ctype.h>

 #import "GNUstepBase/NSNumber+GNUstepBase.h"
--- a/Source/Additions/NSString+GNUstepBase.m
+++ b/Source/Additions/NSString+GNUstepBase.m
@ -23,7 +23,6 @@

 */
 #import "common.h"
-#include <string.h>
 #include <ctype.h>
 #import "Foundation/NSException.h"
 #import "GNUstepBase/NSString+GNUstepBase.h"
--- a/Source/Additions/Unicode.m
+++ b/Source/Additions/Unicode.m
@ -47,7 +47,6 @@
 #import "../GSPrivate.h"

 #include <stdio.h>
-#include <string.h>

 #if HAVE_LANGINFO_CODESET
 #include <langinfo.h>
--- a/Source/GSFileHandle.m
+++ b/Source/GSFileHandle.m
@ -72,8 +72,6 @@
 #endif
 #include <netdb.h>

-#include <string.h>
-
 /*
 *	Stuff for setting the sockets into non-blocking mode.
 */
--- a/Source/GSFormat.m
+++ b/Source/GSFormat.m
@ -58,7 +58,6 @@
 #endif

 #include <stdio.h>
-#include <string.h>

 #import "Foundation/NSArray.h"
 #import "Foundation/NSCharacterSet.h"
--- a/Source/GSHTTPURLHandle.m
+++ b/Source/GSHTTPURLHandle.m
@ -49,8 +49,6 @@
 #import "GSURLPrivate.h"
 #import "GSPrivate.h"

-#include <string.h>
-
 #ifdef	HAVE_SYS_FILE_H
 #  include <sys/file.h>
 #endif
--- a/Source/GSString.m
+++ b/Source/GSString.m
@ -49,12 +49,11 @@
 #import "GSPrivate.h"

 #ifdef HAVE_MALLOC_H
-#if defined(__OpenBSD__)
-#include <stdlib.h>
-#else
+#if !defined(__OpenBSD__)
 #include <malloc.h>
 #endif
 #endif
+
 #ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #endif
--- a/Source/NSBundle.m
+++ b/Source/NSBundle.m
@ -61,8 +61,6 @@ NSString * const NSBundleDidLoadNotification = @"NSBundleDidLoadNotification";
 NSString * const NSShowNonLocalizedStrings = @"NSShowNonLocalizedStrings";
 NSString * const NSLoadedClasses = @"NSLoadedClasses";

-#include <string.h>
-
 static NSFileManager	*
 manager()
 {
--- a/Source/NSDistributedLock.m
+++ b/Source/NSDistributedLock.m
@ -26,7 +26,6 @@
   */

 #import "common.h"
-#include <string.h>
 #define	EXPOSE_NSDistributedLock_IVARS	1
 #import "Foundation/NSDistributedLock.h"
 #import "Foundation/NSFileManager.h"
--- a/Source/NSFileManager.m
+++ b/Source/NSFileManager.m
@ -63,7 +63,6 @@
 #import "GNUstepBase/NSObject+GNUstepBase.h"
 #import "GNUstepBase/NSString+GNUstepBase.h"

-#include <string.h>
 #include <stdio.h>

 /* determine directory reading files */
--- a/Source/NSMessagePort.m
+++ b/Source/NSMessagePort.m
@ -54,7 +54,6 @@
 #include <sys/types.h>
 #include <sys/un.h>
 #include <arpa/inet.h>		/* for inet_ntoa() */
-#include <string.h>		/* for strchr() */
 #include <ctype.h>		/* for strchr() */

 #if	defined(HAVE_SYS_FCNTL_H)
--- a/Source/NSMessagePortNameServer.m
+++ b/Source/NSMessagePortNameServer.m
@ -54,7 +54,6 @@
 #  include	<fcntl.h>
 #endif

-#include <string.h>
 #include <sys/un.h>

 /* Older systems (Solaris) compatibility */
--- a/Source/NSObjCRuntime.m
+++ b/Source/NSObjCRuntime.m
@ -32,7 +32,6 @@
 #endif

 #import "Foundation/NSException.h"
-#include <string.h>

 /**
 * Returns a string object containing the name for
--- a/Source/NSPage.m
+++ b/Source/NSPage.m
@ -26,7 +26,6 @@
   */

 #import "common.h"
-#include <string.h>
 #include <stdio.h>
 #if __mach__
 #include <mach.h>
--- a/Source/NSProcessInfo.m
+++ b/Source/NSProcessInfo.m
@ -57,16 +57,11 @@
 #import "common.h"

 #include <stdio.h>
-#include <string.h>

 #ifdef HAVE_WINDOWS_H
 #  include <windows.h>
 #endif

-#ifdef HAVE_STRERROR
-#  include <errno.h>
-#endif
-
 #if	defined(HAVE_SYS_SIGNAL_H)
 #  include	<sys/signal.h>
 #elif	defined(HAVE_SIGNAL_H)
--- a/Source/NSPropertyList.m
+++ b/Source/NSPropertyList.m
@ -24,7 +24,6 @@
   */

 #import "common.h"
-#include <string.h>
 #import "GNUstepBase/GSMime.h"

 #import "Foundation/NSArray.h"
@ -1147,13 +1146,8 @@ static id parsePlItem(pldata* pld)
                      }
                    else
                      {
-#if     defined(__MINGW__)
-                        result = [[NSNumber alloc]
-                          initWithUnsignedLongLong: _strtoui64(buf, 0, 10)];
-#else
                        result = [[NSNumber alloc]
                          initWithUnsignedLongLong: strtoull(buf, 0, 10)];
-#endif
                      }
 		  }
 		else if (type == 'B')
--- a/Source/NSRunLoop.m
+++ b/Source/NSRunLoop.m
@ -61,7 +61,6 @@
 #endif
 #include <math.h>
 #include <time.h>
-#include <string.h>		/* for memset() */


 NSString * const NSDefaultRunLoopMode = @"NSDefaultRunLoopMode";
--- a/Source/NSSocketPort.m
+++ b/Source/NSSocketPort.m
@ -57,7 +57,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>		/* for inet_ntoa() */
 #endif /* !__MINGW__ */
-#include <string.h>		/* for strchr() */
 #include <ctype.h>		/* for strchr() */

 #if	defined(HAVE_SYS_FCNTL_H)
--- a/Source/NSString.m
+++ b/Source/NSString.m
@ -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;
    } 
 }
--- a/Source/NSTask.m
+++ b/Source/NSTask.m
@ -48,7 +48,6 @@
 #import "GNUstepBase/NSObject+GNUstepBase.h"
 #import "GSPrivate.h"

-#include <string.h>
 #include <sys/types.h>
 #if defined(__FreeBSD__) || defined(__OpenBSD__)
 #include <fcntl.h>
--- a/Source/NSTimeZone.m
+++ b/Source/NSTimeZone.m
@ -88,7 +88,6 @@
 #define	EXPOSE_NSTimeZone_IVARS	1
 #import "GNUstepBase/GSLock.h"
 #include <stdio.h>
-#include <string.h>
 #include <time.h>
 #import "Foundation/NSArray.h"
 #import "Foundation/NSCoder.h"
--- a/Source/NSUnarchiver.m
+++ b/Source/NSUnarchiver.m
@ -32,7 +32,6 @@
 #endif

 #define	EXPOSE_NSUnarchiver_IVARS	1
-#include <string.h>
 #import "Foundation/NSDictionary.h"
 #import "Foundation/NSException.h"
 #import "Foundation/NSByteOrder.h"
--- a/Source/NSZone.m
+++ b/Source/NSZone.m
@ -88,7 +88,6 @@

 #import "common.h"
 #include <stddef.h>
-#include <string.h>
 #import "Foundation/NSException.h"
 #import "Foundation/NSLock.h"
 #import "GSPrivate.h"
--- a/Source/common.h
+++ b/Source/common.h
@ -31,7 +31,7 @@
 #import	"config.h"

 #if	defined(HAVE_STRING_H)
-/* For POSIX strerror_r()
+/* For POSIX strerror_r() and others
 */
 #include <string.h>
 #endif
--- a/Source/win32/GSFileHandle.m
+++ b/Source/win32/GSFileHandle.m
@ -53,8 +53,6 @@
 #include <io.h>
 #include <stdio.h>

-#include <string.h>
-
 #ifndef	O_BINARY
 #ifdef	_O_BINARY
 #define	O_BINARY	_O_BINARY