Author: jddupas
Date: Tue Jul 8 12:42:17 2014
New Revision: 212552
URL: http://llvm.org/viewvc/llvm-project?rev=212552&view=rev
Log:
Simplify Host::GetOSVersion() on macosx.
It removes usage of the deprecated function
CFURLCreateDataAndPropertiesFromResource().
Modified:
lldb/trunk/source/Host/macosx/Host.mm
Modified: lldb/trunk/source/Host/macosx/Host.mm
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/macosx/Host.mm?rev=212552&r1=212551&r2=212552&view=diff
==============================================================================
--- lldb/trunk/source/Host/macosx/Host.mm (original)
+++ lldb/trunk/source/Host/macosx/Host.mm Tue Jul 8 12:42:17 2014
@@ -917,53 +917,14 @@ Host::GetOSVersion
if (g_major == 0)
{
- static const char *version_plist_file =
"/System/Library/CoreServices/SystemVersion.plist";
- char buffer[256];
- const char *product_version_str = NULL;
-
- CFCReleaser<CFURLRef>
plist_url(CFURLCreateFromFileSystemRepresentation(kCFAllocatorDefault,
-
(UInt8 *) version_plist_file,
-
strlen (version_plist_file), NO));
- if (plist_url.get())
- {
- CFCReleaser<CFPropertyListRef> property_list;
- CFCReleaser<CFStringRef> error_string;
- CFCReleaser<CFDataRef> resource_data;
- SInt32 error_code;
-
- // Read the XML file.
- if (CFURLCreateDataAndPropertiesFromResource (kCFAllocatorDefault,
- plist_url.get(),
-
resource_data.ptr_address(),
- NULL,
- NULL,
- &error_code))
- {
- // Reconstitute the dictionary using the XML data.
- property_list = CFPropertyListCreateFromXMLData
(kCFAllocatorDefault,
-
resource_data.get(),
-
kCFPropertyListImmutable,
-
error_string.ptr_address());
- if (CFGetTypeID(property_list.get()) ==
CFDictionaryGetTypeID())
- {
- CFDictionaryRef property_dict = (CFDictionaryRef)
property_list.get();
- CFStringRef product_version_key = CFSTR("ProductVersion");
- CFPropertyListRef product_version_value;
- product_version_value =
CFDictionaryGetValue(property_dict, product_version_key);
- if (product_version_value &&
CFGetTypeID(product_version_value) == CFStringGetTypeID())
- {
- CFStringRef product_version_cfstr = (CFStringRef)
product_version_value;
- product_version_str =
CFStringGetCStringPtr(product_version_cfstr, kCFStringEncodingUTF8);
- if (product_version_str != NULL) {
- if (CFStringGetCString(product_version_cfstr,
buffer, 256, kCFStringEncodingUTF8))
- product_version_str = buffer;
- }
- }
- }
- }
+ @autoreleasepool {
+ NSDictionary *version_info = [NSDictionary
dictionaryWithContentsOfFile:
+
@"/System/Library/CoreServices/SystemVersion.plist"];
+ NSString *version_value = [version_info
objectForKey:@"ProductVersion"];
+ const char *version_str = [version_value UTF8String];
+ if (version_str)
+ Args::StringToVersion(version_str, g_major, g_minor, g_update);
}
- if (product_version_str)
- Args::StringToVersion(product_version_str, g_major, g_minor,
g_update);
}
if (g_major != 0)
_______________________________________________
lldb-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
