Reformat the WebRTC code base
Running clang-format with chromium's style guide. The goal is n-fold: * providing consistency and readability (that's what code guidelines are for) * preventing noise with presubmit checks and git cl format * building on the previous point: making it easier to automatically fix format issues * you name it Please consider using git-hyper-blame to ignore this commit. Bug: webrtc:9340 Change-Id: I694567c4cdf8cee2860958cfe82bfaf25848bb87 Reviewed-on: https://webrtc-review.googlesource.com/81185 Reviewed-by: Patrik Höglund <phoglund@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23660}
This commit is contained in:
@ -25,10 +25,11 @@ bool ToUtf8(const CFStringRef str16, std::string* str8) {
|
||||
return false;
|
||||
}
|
||||
size_t maxlen = CFStringGetMaximumSizeForEncoding(CFStringGetLength(str16),
|
||||
kCFStringEncodingUTF8) + 1;
|
||||
kCFStringEncodingUTF8) +
|
||||
1;
|
||||
std::unique_ptr<char[]> buffer(new char[maxlen]);
|
||||
if (!buffer || !CFStringGetCString(str16, buffer.get(), maxlen,
|
||||
kCFStringEncodingUTF8)) {
|
||||
if (!buffer ||
|
||||
!CFStringGetCString(str16, buffer.get(), maxlen, kCFStringEncodingUTF8)) {
|
||||
return false;
|
||||
}
|
||||
str8->assign(buffer.get());
|
||||
@ -41,8 +42,7 @@ bool ToUtf16(const std::string& str8, CFStringRef* str16) {
|
||||
}
|
||||
*str16 = CFStringCreateWithBytes(kCFAllocatorDefault,
|
||||
reinterpret_cast<const UInt8*>(str8.data()),
|
||||
str8.length(), kCFStringEncodingUTF8,
|
||||
false);
|
||||
str8.length(), kCFStringEncodingUTF8, false);
|
||||
return nullptr != *str16;
|
||||
}
|
||||
} // namespace rtc
|
||||
|
Reference in New Issue
Block a user