From cb5aa8f8c6422394d95521ac9f0d74e230b3407e Mon Sep 17 00:00:00 2001 From: Richard Frith-Macdonald Date: Tue, 1 Oct 2002 12:46:24 +0000 Subject: [PATCH] Minor tidyups git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@14616 72102866-910b-0410-8b05-ffd578937521 --- SSL/GSSSLHandle.m | 8 -------- Source/NSCalendarDate.m | 16 +++++++++++++++- Testing/nsdate.m | 4 ++++ 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/SSL/GSSSLHandle.m b/SSL/GSSSLHandle.m index 3109fb552..79569d995 100644 --- a/SSL/GSSSLHandle.m +++ b/SSL/GSSSLHandle.m @@ -81,14 +81,6 @@ #endif #include -// Maximum data in single I/O operation -#define NETBUF_SIZE 4096 - -// Key to info dictionary for operation mode. -static NSString* NotificationKey = @"NSFileHandleNotificationKey"; - - - @interface GSSSLHandle : GSFileHandle { SSL_CTX *ctx; diff --git a/Source/NSCalendarDate.m b/Source/NSCalendarDate.m index 6152c0a0a..cdf46b66a 100644 --- a/Source/NSCalendarDate.m +++ b/Source/NSCalendarDate.m @@ -1369,7 +1369,11 @@ static inline int getDigits(const char *from, char *to, int limit) return y; } -// Providing Adjusted Dates +/** + * This method exists solely for conformance to the OpenStep spec. + * Its use is deprecated ... it simply calls + * -dateByAddingYears:months:days:hours:minutes:seconds: + */ - (NSCalendarDate*) addYear: (int)year month: (int)month day: (int)day @@ -1770,6 +1774,16 @@ static inline int getDigits(const char *from, char *to, int limit) @implementation NSCalendarDate (OPENSTEP) +/** + *

Returns a calendar date formed by adding the specified offsets to the + * receiver. The offsets are added in order, years, then months, then + * days, then hours then minutes then seconds, so if you add 1 month and + * forty days to 20th September, the result will be 9th November. + *

+ *

This method understands leap years and tries to adjust for daylight + * savings time changes so that it preserves expected clock time. + *

+ */ - (NSCalendarDate*) dateByAddingYears: (int)years months: (int)months days: (int)days diff --git a/Testing/nsdate.m b/Testing/nsdate.m index 25eb6aa3e..340a062fe 100644 --- a/Testing/nsdate.m +++ b/Testing/nsdate.m @@ -237,6 +237,10 @@ if ([(NSDate*) [NSCalendarDate date] compare: printf("Add four hours - %s\n", [DESCRIP_FORMAT(c) cString]); c = [c addYear:0 month:0 day:0 hour:-24 minute:0 second:0]; printf("Subtract twentyfour hours - %s\n", [DESCRIP_FORMAT(c) cString]); + c = [c addYear:0 month:0 day:0 hour:24 minute:0 second:0]; + printf("Add twentyfour hours - %s\n", [DESCRIP_FORMAT(c) cString]); + c = [c addYear:0 month:0 day:-1 hour:0 minute:0 second:0]; + printf("Subtract a day - %s\n", [DESCRIP_FORMAT(c) cString]); c = [NSCalendarDate dateWithString: @"2002-10-27 00:30:00 GB" calendarFormat: @"%Y-%m-%d %H:%M:%S %Z"];