summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-04-03 23:11:14 +0200
committerCarl Hetherington <cth@carlh.net>2020-04-03 23:11:14 +0200
commit7101f158ece4cd3d8b5fa263dde83a03c0910082 (patch)
tree11983a8abd75e667b04896f11ef98090483fac77
parent20435d662926e7b3227e8d3167841caad184f85a (diff)
Fix up previous.
-rw-r--r--src/lib/cross_osx.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/lib/cross_osx.cc b/src/lib/cross_osx.cc
index 2c97ab1ab..cbc309246 100644
--- a/src/lib/cross_osx.cc
+++ b/src/lib/cross_osx.cc
@@ -256,15 +256,17 @@ disk_appeared (DADiskRef disk, void* context)
optional<string> vendor;
void const* str = CFDictionaryGetValue (description, kDADiskDescriptionDeviceVendorKey);
if (str) {
- vendor = CFStringGetCStringPtr ((CFStringRef) str, kCFStringEncodingUTF8);
- vendor = boost::algorithm::trim (*vendor);
+ string s = CFStringGetCStringPtr ((CFStringRef) str, kCFStringEncodingUTF8);
+ boost::algorithm::trim (s);
+ vendor = s;
}
optional<string> model;
str = CFDictionaryGetValue (description, kDADiskDescriptionDeviceModelKey);
if (str) {
- model = CFStringGetCStringPtr ((CFStringRef) str, kCFStringEncodingUTF8);
- model = boost::algorithm::trim (*model);
+ string s = CFStringGetCStringPtr ((CFStringRef) str, kCFStringEncodingUTF8);
+ boost::algorithm::trim (s);
+ model = s;
}
str = CFDictionaryGetValue (description, kDADiskDescriptionMediaPathKey);