@@ -1186,7 +1186,6 @@ Boolean _CFTimeZoneInit(CFTimeZoneRef timeZone, CFStringRef name, CFDataRef data
1186
1186
}
1187
1187
1188
1188
CFStringRef tzName = NULL ;
1189
- Boolean tryAbbrev = true;
1190
1189
CFURLRef baseURL , tempURL ;
1191
1190
void * bytes ;
1192
1191
CFIndex length ;
@@ -1199,20 +1198,20 @@ Boolean _CFTimeZoneInit(CFTimeZoneRef timeZone, CFStringRef name, CFDataRef data
1199
1198
#else
1200
1199
baseURL = CFURLCreateWithFileSystemPath (kCFAllocatorSystemDefault , __tzZoneInfo , kCFURLPOSIXPathStyle , true);
1201
1200
#endif
1202
- if (tryAbbrev ) {
1203
- CFDictionaryRef abbrevs = CFTimeZoneCopyAbbreviationDictionary ();
1204
- tzName = CFDictionaryGetValue (abbrevs , name );
1205
- if (NULL != tzName ) {
1206
- tempURL = CFURLCreateCopyAppendingPathComponent (kCFAllocatorSystemDefault , baseURL , tzName , false);
1207
- if (NULL != tempURL ) {
1208
- if (_CFReadBytesFromFile (kCFAllocatorSystemDefault , tempURL , & bytes , & length , 0 , 0 )) {
1209
- data = CFDataCreateWithBytesNoCopy (kCFAllocatorSystemDefault , bytes , length , kCFAllocatorSystemDefault );
1210
- }
1211
- CFRelease (tempURL );
1201
+
1202
+ CFDictionaryRef abbrevs = CFTimeZoneCopyAbbreviationDictionary ();
1203
+ tzName = CFDictionaryGetValue (abbrevs , name );
1204
+ if (NULL != tzName ) {
1205
+ tempURL = CFURLCreateCopyAppendingPathComponent (kCFAllocatorSystemDefault , baseURL , tzName , false);
1206
+ if (NULL != tempURL ) {
1207
+ if (_CFReadBytesFromFile (kCFAllocatorSystemDefault , tempURL , & bytes , & length , 0 , 0 )) {
1208
+ data = CFDataCreateWithBytesNoCopy (kCFAllocatorSystemDefault , bytes , length , kCFAllocatorSystemDefault );
1212
1209
}
1210
+ CFRelease (tempURL );
1213
1211
}
1214
- CFRelease (abbrevs );
1215
1212
}
1213
+ CFRelease (abbrevs );
1214
+
1216
1215
if (NULL == data ) {
1217
1216
CFDictionaryRef dict = __CFTimeZoneCopyCompatibilityDictionary ();
1218
1217
CFStringRef mapping = CFDictionaryGetValue (dict , name );
0 commit comments