Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Side by Side Diff: webrtc/base/macutils.cc

Issue 2718663005: Replace NULL with nullptr or null in webrtc/base/. (Closed)
Patch Set: Fixing Windows and formatting issues. Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/base/logging_unittest.cc ('k') | webrtc/base/messagedigest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2007 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2007 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include <cstring> 11 #include <cstring>
12 #include <memory> 12 #include <memory>
13 #include <sstream> 13 #include <sstream>
14 14
15 #include <sys/utsname.h> 15 #include <sys/utsname.h>
16 16
17 #include "webrtc/base/checks.h" 17 #include "webrtc/base/checks.h"
18 #include "webrtc/base/logging.h" 18 #include "webrtc/base/logging.h"
19 #include "webrtc/base/macutils.h" 19 #include "webrtc/base/macutils.h"
20 #include "webrtc/base/stringutils.h" 20 #include "webrtc/base/stringutils.h"
21 21
22 namespace rtc { 22 namespace rtc {
23 23
24 /////////////////////////////////////////////////////////////////////////////// 24 ///////////////////////////////////////////////////////////////////////////////
25 25
26 bool ToUtf8(const CFStringRef str16, std::string* str8) { 26 bool ToUtf8(const CFStringRef str16, std::string* str8) {
27 if ((NULL == str16) || (NULL == str8)) { 27 if ((nullptr == str16) || (nullptr == str8)) {
28 return false; 28 return false;
29 } 29 }
30 size_t maxlen = CFStringGetMaximumSizeForEncoding(CFStringGetLength(str16), 30 size_t maxlen = CFStringGetMaximumSizeForEncoding(CFStringGetLength(str16),
31 kCFStringEncodingUTF8) + 1; 31 kCFStringEncodingUTF8) + 1;
32 std::unique_ptr<char[]> buffer(new char[maxlen]); 32 std::unique_ptr<char[]> buffer(new char[maxlen]);
33 if (!buffer || !CFStringGetCString(str16, buffer.get(), maxlen, 33 if (!buffer || !CFStringGetCString(str16, buffer.get(), maxlen,
34 kCFStringEncodingUTF8)) { 34 kCFStringEncodingUTF8)) {
35 return false; 35 return false;
36 } 36 }
37 str8->assign(buffer.get()); 37 str8->assign(buffer.get());
38 return true; 38 return true;
39 } 39 }
40 40
41 bool ToUtf16(const std::string& str8, CFStringRef* str16) { 41 bool ToUtf16(const std::string& str8, CFStringRef* str16) {
42 if (NULL == str16) { 42 if (nullptr == str16) {
43 return false; 43 return false;
44 } 44 }
45 *str16 = CFStringCreateWithBytes(kCFAllocatorDefault, 45 *str16 = CFStringCreateWithBytes(kCFAllocatorDefault,
46 reinterpret_cast<const UInt8*>(str8.data()), 46 reinterpret_cast<const UInt8*>(str8.data()),
47 str8.length(), kCFStringEncodingUTF8, 47 str8.length(), kCFStringEncodingUTF8,
48 false); 48 false);
49 return NULL != *str16; 49 return nullptr != *str16;
50 } 50 }
51 51
52 void DecodeFourChar(UInt32 fc, std::string* out) { 52 void DecodeFourChar(UInt32 fc, std::string* out) {
53 std::stringstream ss; 53 std::stringstream ss;
54 ss << '\''; 54 ss << '\'';
55 bool printable = true; 55 bool printable = true;
56 for (int i = 3; i >= 0; --i) { 56 for (int i = 3; i >= 0; --i) {
57 char ch = (fc >> (8 * i)) & 0xFF; 57 char ch = (fc >> (8 * i)) & 0xFF;
58 if (isprint(static_cast<unsigned char>(ch))) { 58 if (isprint(static_cast<unsigned char>(ch))) {
59 ss << ch; 59 ss << ch;
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 case 7: 116 case 7:
117 return kMacOSLion; 117 return kMacOSLion;
118 case 8: 118 case 8:
119 return kMacOSMountainLion; 119 return kMacOSMountainLion;
120 case 9: 120 case 9:
121 return kMacOSMavericks; 121 return kMacOSMavericks;
122 } 122 }
123 return kMacOSNewer; 123 return kMacOSNewer;
124 } 124 }
125 } // namespace rtc 125 } // namespace rtc
OLDNEW
« no previous file with comments | « webrtc/base/logging_unittest.cc ('k') | webrtc/base/messagedigest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698