Changeset 26807 in vbox for trunk/src

Timestamp:

Feb 25, 2010 4:44:20 PM (15 years ago)

Author:

vboxsync

Message:

Runtime/r3/darwin: RTSystemQueryDmiString cleanup

File:

• trunk/src/VBox/Runtime/r3/darwin/RTSystemQueryDmiString-darwin.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/darwin/RTSystemQueryDmiString-darwin.cpp

@@ -47 +47 @@
 #define PROP_PRODUCT_NAME                    "product-name"
 #define PROP_PRODUCT_VERSION                 "version"
-#define PROP_SERIAL_NUMBER                   "IOPlatformSerialNumber"
-#define PROP_HARDWARE_UUID                   "IOPlatformUUID"
+#define PROP_PRODUCT_SERIAL                  "IOPlatformSerialNumber"
+#define PROP_PRODUCT_UUID                    "IOPlatformUUID"
 
 RTDECL(int) RTSystemQueryDmiString(RTSYSDMISTR enmString, char *pszBuf, size_t cbBuf)
@@ -60 +60 @@
     switch (enmString)
     {
-        case RTSYSDMISTR_PRODUCT_NAME:    PropStringRef = CFStringCreateWithCString(kCFAllocatorDefault, PROP_PRODUCT_NAME, kCFStringEncodingASCII); break;
-        case RTSYSDMISTR_PRODUCT_VERSION: PropStringRef = CFStringCreateWithCString(kCFAllocatorDefault, PROP_PRODUCT_VERSION, kCFStringEncodingASCII); break;
-        case RTSYSDMISTR_PRODUCT_SERIAL:  PropStringRef = CFStringCreateWithCString(kCFAllocatorDefault, PROP_SERIAL_NUMBER, kCFStringEncodingASCII); break;
-        case RTSYSDMISTR_PRODUCT_UUID:    PropStringRef = CFStringCreateWithCString(kCFAllocatorDefault, PROP_HARDWARE_UUID, kCFStringEncodingASCII); break;
+        case RTSYSDMISTR_PRODUCT_NAME:    PropStringRef = CFSTR(PROP_PRODUCT_NAME);    break;
+        case RTSYSDMISTR_PRODUCT_VERSION: PropStringRef = CFSTR(PROP_PRODUCT_VERSION); break;
+        case RTSYSDMISTR_PRODUCT_SERIAL:  PropStringRef = CFSTR(PROP_PRODUCT_SERIAL);  break;
+        case RTSYSDMISTR_PRODUCT_UUID:    PropStringRef = CFSTR(PROP_PRODUCT_UUID);    break;
         default:
             return VERR_NOT_SUPPORTED;