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