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

Tiny simplification

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@16313 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
CaS 2003-04-01 11:20:41 +00:00
parent a42b8acf0f
commit b0182d3c56
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2003-04-01 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSCalendarDate.m: trivial simplification of timezone
handling.
2003-03-31 Stephane Corthesy <stephane@sente.ch> 2003-03-31 Stephane Corthesy <stephane@sente.ch>
* Source/Additions/GCArray.m: Replace retain/release by * Source/Additions/GCArray.m: Replace retain/release by

13
Source/NSCalendarDate.m
View file

@ -589,7 +589,7 @@ static inline int getDigits(const char *from, char *to, int limit)
{ {
int year = 0, month = 1, day = 1; int year = 0, month = 1, day = 1;
int hour = 0, min = 0, sec = 0; int hour = 0, min = 0, sec = 0;
NSTimeZone *tz = localTZ; NSTimeZone *tz = nil;
BOOL ampm = NO; BOOL ampm = NO;
BOOL twelveHrClock = NO; BOOL twelveHrClock = NO;
int julianWeeks = -1, weekStartsMonday = 0, dayOfWeek = -1; int julianWeeks = -1, weekStartsMonday = 0, dayOfWeek = -1;
@ -1045,11 +1045,8 @@ static inline int getDigits(const char *from, char *to, int limit)
sourceIdx += getDigits(&source[sourceIdx], tmpStr, 4); sourceIdx += getDigits(&source[sourceIdx], tmpStr, 4);
zone = atoi(tmpStr) * sign; zone = atoi(tmpStr) * sign;
if ((tz = [NSTimeZone timeZoneForSecondsFromGMT: tz = [NSTimeZone timeZoneForSecondsFromGMT:
(zone / 100 * 60 + (zone % 100)) * 60]) == nil) (zone / 100 * 60 + (zone % 100)) * 60];
{
tz = localTZ;
}
} }
break; break;
@ -1076,10 +1073,6 @@ static inline int getDigits(const char *from, char *to, int limit)
{ {
tz = [NSTimeZone timeZoneWithAbbreviation: z]; tz = [NSTimeZone timeZoneWithAbbreviation: z];
} }
if (tz == nil)
{
tz = localTZ;
}
} }
break; break;