projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8d43d5f
)
Trim spaces from vendor/model.
author
Carl Hetherington
<cth@carlh.net>
Fri, 3 Apr 2020 21:03:51 +0000
(23:03 +0200)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 3 Apr 2020 21:03:51 +0000
(23:03 +0200)
src/lib/cross_osx.cc
patch
|
blob
|
history
diff --git
a/src/lib/cross_osx.cc
b/src/lib/cross_osx.cc
index a9585401565fbacc58065daffc379502217c0ea1..2c97ab1ab7df91bd1aac6231e1fc87fdbf0e51bb 100644
(file)
--- a/
src/lib/cross_osx.cc
+++ b/
src/lib/cross_osx.cc
@@
-257,12
+257,14
@@
disk_appeared (DADiskRef disk, void* context)
void const* str = CFDictionaryGetValue (description, kDADiskDescriptionDeviceVendorKey);
if (str) {
vendor = CFStringGetCStringPtr ((CFStringRef) str, kCFStringEncodingUTF8);
void const* str = CFDictionaryGetValue (description, kDADiskDescriptionDeviceVendorKey);
if (str) {
vendor = CFStringGetCStringPtr ((CFStringRef) str, kCFStringEncodingUTF8);
+ vendor = boost::algorithm::trim (*vendor);
}
optional<string> model;
str = CFDictionaryGetValue (description, kDADiskDescriptionDeviceModelKey);
if (str) {
model = CFStringGetCStringPtr ((CFStringRef) str, kCFStringEncodingUTF8);
}
optional<string> model;
str = CFDictionaryGetValue (description, kDADiskDescriptionDeviceModelKey);
if (str) {
model = CFStringGetCStringPtr ((CFStringRef) str, kCFStringEncodingUTF8);
+ model = boost::algorithm::trim (*model);
}
str = CFDictionaryGetValue (description, kDADiskDescriptionMediaPathKey);
}
str = CFDictionaryGetValue (description, kDADiskDescriptionMediaPathKey);