Skip to content

Move duplicated code into its own function. #2172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
drodriguez merged 1 commit into from
Apr 25, 2019
Merged

Move duplicated code into its own function. #2172

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 20 additions & 34 deletions CoreFoundation/NumberDate.subproj/CFTimeZone.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1058,6 +1058,20 @@ Boolean _CFTimeZoneInitInternal(CFTimeZoneRef timezone, CFStringRef name, CFData
return success;
}

CFDataRef _CFTimeZoneDataCreate(CFURLRef baseURL, CFStringRef tzName) {
void *bytes;
CFIndex length;
CFDataRef data = NULL;
CFURLRef tempURL = CFURLCreateCopyAppendingPathComponent(kCFAllocatorSystemDefault, baseURL, tzName, false);
if (NULL != tempURL) {
if (_CFReadBytesFromFile(kCFAllocatorSystemDefault, tempURL, &bytes, &length, 0, 0)) {
data = CFDataCreateWithBytesNoCopy(kCFAllocatorSystemDefault, bytes, length, kCFAllocatorSystemDefault);
}
CFRelease(tempURL);
}
return data;
}

Boolean _CFTimeZoneInit(CFTimeZoneRef timeZone, CFStringRef name, CFDataRef data) {
if (!name || !__nameStringOK(name)) {
return false;
Expand Down Expand Up @@ -1093,9 +1107,7 @@ Boolean _CFTimeZoneInit(CFTimeZoneRef timeZone, CFStringRef name, CFDataRef data
}

CFStringRef tzName = NULL;
CFURLRef baseURL, tempURL;
void *bytes;
CFIndex length;
CFURLRef baseURL;
Boolean result = false;

#if TARGET_OS_WIN32
Expand Down Expand Up @@ -1128,13 +1140,7 @@ Boolean _CFTimeZoneInit(CFTimeZoneRef timeZone, CFStringRef name, CFDataRef data
CFDictionaryRef abbrevs = CFTimeZoneCopyAbbreviationDictionary();
tzName = CFDictionaryGetValue(abbrevs, name);
if (NULL != tzName) {
tempURL = CFURLCreateCopyAppendingPathComponent(kCFAllocatorSystemDefault, baseURL, tzName, false);
if (NULL != tempURL) {
if (_CFReadBytesFromFile(kCFAllocatorSystemDefault, tempURL, &bytes, &length, 0, 0)) {
data = CFDataCreateWithBytesNoCopy(kCFAllocatorSystemDefault, bytes, length, kCFAllocatorSystemDefault);
}
CFRelease(tempURL);
}
data = _CFTimeZoneDataCreate(baseURL, tzName);
}
CFRelease(abbrevs);

Expand All @@ -1159,13 +1165,7 @@ Boolean _CFTimeZoneInit(CFTimeZoneRef timeZone, CFStringRef name, CFDataRef data
}
if (NULL == data) {
tzName = name;
tempURL = CFURLCreateCopyAppendingPathComponent(kCFAllocatorSystemDefault, baseURL, tzName, false);
if (NULL != tempURL) {
if (_CFReadBytesFromFile(kCFAllocatorSystemDefault, tempURL, &bytes, &length, 0, 0)) {
data = CFDataCreateWithBytesNoCopy(kCFAllocatorSystemDefault, bytes, length, kCFAllocatorSystemDefault);
}
CFRelease(tempURL);
}
data = _CFTimeZoneDataCreate(baseURL, tzName);
}
CFRelease(baseURL);
if (NULL != data) {
Expand Down Expand Up @@ -1311,9 +1311,7 @@ CFTimeZoneRef CFTimeZoneCreateWithName(CFAllocatorRef allocator, CFStringRef nam
}
}
}
CFURLRef baseURL, tempURL;
void *bytes;
CFIndex length;
CFURLRef baseURL;

#if TARGET_OS_WIN32
CFDictionaryRef abbrevs = CFTimeZoneCopyAbbreviationDictionary();
Expand Down Expand Up @@ -1344,13 +1342,7 @@ CFTimeZoneRef CFTimeZoneCreateWithName(CFAllocatorRef allocator, CFStringRef nam
CFDictionaryRef abbrevs = CFTimeZoneCopyAbbreviationDictionary();
tzName = CFDictionaryGetValue(abbrevs, name);
if (NULL != tzName) {
tempURL = CFURLCreateCopyAppendingPathComponent(kCFAllocatorSystemDefault, baseURL, tzName, false);
if (NULL != tempURL) {
if (_CFReadBytesFromFile(kCFAllocatorSystemDefault, tempURL, &bytes, &length, 0, 0)) {
data = CFDataCreateWithBytesNoCopy(kCFAllocatorSystemDefault, bytes, length, kCFAllocatorSystemDefault);
}
CFRelease(tempURL);
}
data = _CFTimeZoneDataCreate(baseURL, tzName);
}
CFRelease(abbrevs);
}
Expand All @@ -1375,13 +1367,7 @@ CFTimeZoneRef CFTimeZoneCreateWithName(CFAllocatorRef allocator, CFStringRef nam
}
if (NULL == data) {
tzName = name;
tempURL = CFURLCreateCopyAppendingPathComponent(kCFAllocatorSystemDefault, baseURL, tzName, false);
if (NULL != tempURL) {
if (_CFReadBytesFromFile(kCFAllocatorSystemDefault, tempURL, &bytes, &length, 0, 0)) {
data = CFDataCreateWithBytesNoCopy(kCFAllocatorSystemDefault, bytes, length, kCFAllocatorSystemDefault);
}
CFRelease(tempURL);
}
data = _CFTimeZoneDataCreate(baseURL, tzName);
}
CFRelease(baseURL);
if (NULL != data) {
Expand Down