@@ -1498,39 +1498,39 @@ CFTimeZoneRef CFTimeZoneCreateWithName(CFAllocatorRef allocator, CFStringRef nam
1498
1498
__CFGenericValidateType (allocator , CFAllocatorGetTypeID ());
1499
1499
__CFGenericValidateType (name , CFStringGetTypeID ());
1500
1500
if (CFEqual (CFSTR ("" ), name )) {
1501
- // empty string is not a time zone name, just abort now,
1502
- // following stuff will fail anyway
1503
- return NULL ;
1501
+ // empty string is not a time zone name, just abort now,
1502
+ // following stuff will fail anyway
1503
+ return NULL ;
1504
1504
}
1505
1505
__CFTimeZoneLockGlobal ();
1506
1506
if (NULL != __CFTimeZoneCache && CFDictionaryGetValueIfPresent (__CFTimeZoneCache , name , (const void * * )& result )) {
1507
- __CFTimeZoneUnlockGlobal ();
1508
- return (CFTimeZoneRef )CFRetain (result );
1507
+ __CFTimeZoneUnlockGlobal ();
1508
+ return (CFTimeZoneRef )CFRetain (result );
1509
1509
}
1510
1510
__CFTimeZoneUnlockGlobal ();
1511
1511
CFIndex len = CFStringGetLength (name );
1512
1512
if (6 == len || 8 == len ) {
1513
- UniChar buffer [8 ];
1514
- CFStringGetCharacters (name , CFRangeMake (0 , len ), buffer );
1515
- if ('G' == buffer [0 ] && 'M' == buffer [1 ] && 'T' == buffer [2 ] && ('+' == buffer [3 ] || '-' == buffer [3 ])) {
1516
- if (('0' <= buffer [4 ] && buffer [4 ] <= '9' ) && ('0' <= buffer [5 ] && buffer [5 ] <= '9' )) {
1517
- int32_t hours = (buffer [4 ] - '0' ) * 10 + (buffer [5 ] - '0' );
1518
- if (-14 <= hours && hours <= 14 ) {
1519
- CFTimeInterval ti = hours * 3600.0 ;
1520
- if (6 == len ) {
1521
- return CFTimeZoneCreateWithTimeIntervalFromGMT (allocator , ('-' == buffer [3 ] ? -1.0 : 1.0 ) * ti );
1522
- } else {
1523
- if (('0' <= buffer [6 ] && buffer [6 ] <= '9' ) && ('0' <= buffer [7 ] && buffer [7 ] <= '9' )) {
1524
- int32_t minutes = (buffer [6 ] - '0' ) * 10 + (buffer [7 ] - '0' );
1525
- if ((-14 == hours && 0 == minutes ) || (14 == hours && 0 == minutes ) || (0 <= minutes && minutes <= 59 )) {
1526
- ti = ti + minutes * 60.0 ;
1527
- return CFTimeZoneCreateWithTimeIntervalFromGMT (allocator , ('-' == buffer [3 ] ? -1.0 : 1.0 ) * ti );
1528
- }
1529
- }
1530
- }
1531
- }
1513
+ UniChar buffer [8 ];
1514
+ CFStringGetCharacters (name , CFRangeMake (0 , len ), buffer );
1515
+ if ('G' == buffer [0 ] && 'M' == buffer [1 ] && 'T' == buffer [2 ] && ('+' == buffer [3 ] || '-' == buffer [3 ])) {
1516
+ if (('0' <= buffer [4 ] && buffer [4 ] <= '9' ) && ('0' <= buffer [5 ] && buffer [5 ] <= '9' )) {
1517
+ int32_t hours = (buffer [4 ] - '0' ) * 10 + (buffer [5 ] - '0' );
1518
+ if (-14 <= hours && hours <= 14 ) {
1519
+ CFTimeInterval ti = hours * 3600.0 ;
1520
+ if (6 == len ) {
1521
+ return CFTimeZoneCreateWithTimeIntervalFromGMT (allocator , ('-' == buffer [3 ] ? -1.0 : 1.0 ) * ti );
1522
+ } else {
1523
+ if (('0' <= buffer [6 ] && buffer [6 ] <= '9' ) && ('0' <= buffer [7 ] && buffer [7 ] <= '9' )) {
1524
+ int32_t minutes = (buffer [6 ] - '0' ) * 10 + (buffer [7 ] - '0' );
1525
+ if ((-14 == hours && 0 == minutes ) || (14 == hours && 0 == minutes ) || (0 <= minutes && minutes <= 59 )) {
1526
+ ti = ti + minutes * 60.0 ;
1527
+ return CFTimeZoneCreateWithTimeIntervalFromGMT (allocator , ('-' == buffer [3 ] ? -1.0 : 1.0 ) * ti );
1528
+ }
1529
+ }
1530
+ }
1531
+ }
1532
+ }
1532
1533
}
1533
- }
1534
1534
}
1535
1535
CFURLRef baseURL = NULL ;
1536
1536
@@ -1568,35 +1568,35 @@ CFTimeZoneRef CFTimeZoneCreateWithName(CFAllocatorRef allocator, CFStringRef nam
1568
1568
baseURL = CFURLCreateWithFileSystemPath (kCFAllocatorSystemDefault , __tzZoneInfo , kCFURLPOSIXPathStyle , true);
1569
1569
#endif
1570
1570
if (tryAbbrev ) {
1571
- CFDictionaryRef abbrevs = CFTimeZoneCopyAbbreviationDictionary ();
1572
- tzName = CFDictionaryGetValue (abbrevs , name );
1573
- if (NULL != tzName ) {
1574
- data = _CFTimeZoneDataCreate (baseURL , tzName );
1575
- }
1576
- CFRelease (abbrevs );
1571
+ CFDictionaryRef abbrevs = CFTimeZoneCopyAbbreviationDictionary ();
1572
+ tzName = CFDictionaryGetValue (abbrevs , name );
1573
+ if (NULL != tzName ) {
1574
+ data = _CFTimeZoneDataCreate (baseURL , tzName );
1575
+ }
1576
+ CFRelease (abbrevs );
1577
1577
}
1578
1578
if (NULL == data ) {
1579
- CFDictionaryRef dict = __CFTimeZoneCopyCompatibilityDictionary ();
1580
- CFStringRef mapping = CFDictionaryGetValue (dict , name );
1581
- if (mapping ) {
1582
- name = mapping ;
1583
- }
1579
+ CFDictionaryRef dict = __CFTimeZoneCopyCompatibilityDictionary ();
1580
+ CFStringRef mapping = CFDictionaryGetValue (dict , name );
1581
+ if (mapping ) {
1582
+ name = mapping ;
1583
+ }
1584
1584
#if !TARGET_OS_ANDROID
1585
- else if (CFStringHasPrefix (name , __tzZoneInfo )) {
1586
- CFMutableStringRef unprefixed = CFStringCreateMutableCopy (kCFAllocatorSystemDefault , CFStringGetLength (name ), name );
1587
- CFStringDelete (unprefixed , CFRangeMake (0 , CFStringGetLength (__tzZoneInfo )));
1588
- mapping = CFDictionaryGetValue (dict , unprefixed );
1589
- if (mapping ) {
1590
- name = mapping ;
1591
- }
1592
- CFRelease (unprefixed );
1593
- }
1585
+ else if (CFStringHasPrefix (name , __tzZoneInfo )) {
1586
+ CFMutableStringRef unprefixed = CFStringCreateMutableCopy (kCFAllocatorSystemDefault , CFStringGetLength (name ), name );
1587
+ CFStringDelete (unprefixed , CFRangeMake (0 , CFStringGetLength (__tzZoneInfo )));
1588
+ mapping = CFDictionaryGetValue (dict , unprefixed );
1589
+ if (mapping ) {
1590
+ name = mapping ;
1591
+ }
1592
+ CFRelease (unprefixed );
1593
+ }
1594
1594
#endif
1595
- CFRelease (dict );
1596
- if (CFEqual (CFSTR ("" ), name )) {
1597
- CFRelease (baseURL );
1598
- return NULL ;
1599
- }
1595
+ CFRelease (dict );
1596
+ if (CFEqual (CFSTR ("" ), name )) {
1597
+ CFRelease (baseURL );
1598
+ return NULL ;
1599
+ }
1600
1600
}
1601
1601
if (NULL == data ) {
1602
1602
tzName = name ;
@@ -1606,15 +1606,15 @@ CFTimeZoneRef CFTimeZoneCreateWithName(CFAllocatorRef allocator, CFStringRef nam
1606
1606
CFRelease (baseURL );
1607
1607
}
1608
1608
if (NULL != data ) {
1609
- result = CFTimeZoneCreate (allocator , tzName , data );
1610
- if (name != tzName ) {
1611
- CFStringRef nameCopy = (CFStringRef )CFStringCreateCopy (allocator , name );
1612
- __CFTimeZoneLockGlobal ();
1613
- CFDictionaryAddValue (__CFTimeZoneCache , nameCopy , result );
1614
- __CFTimeZoneUnlockGlobal ();
1615
- CFRelease (nameCopy );
1616
- }
1617
- CFRelease (data );
1609
+ result = CFTimeZoneCreate (allocator , tzName , data );
1610
+ if (name != tzName ) {
1611
+ CFStringRef nameCopy = (CFStringRef )CFStringCreateCopy (allocator , name );
1612
+ __CFTimeZoneLockGlobal ();
1613
+ CFDictionaryAddValue (__CFTimeZoneCache , nameCopy , result );
1614
+ __CFTimeZoneUnlockGlobal ();
1615
+ CFRelease (nameCopy );
1616
+ }
1617
+ CFRelease (data );
1618
1618
}
1619
1619
return result ;
1620
1620
#endif
0 commit comments