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

Side by Side Diff: util/mac/launchd.mm

Issue 656703002: Convert NULL to nullptr (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: Fix 80-column violations Created 6 years, 2 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 | « util/mac/launchd.h ('k') | util/mac/mac_util.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Crashpad Authors. All rights reserved. 1 // Copyright 2014 The Crashpad Authors. All rights reserved.
2 // 2 //
3 // Licensed under the Apache License, Version 2.0 (the "License"); 3 // Licensed under the Apache License, Version 2.0 (the "License");
4 // you may not use this file except in compliance with the License. 4 // you may not use this file except in compliance with the License.
5 // You may obtain a copy of the License at 5 // You may obtain a copy of the License at
6 // 6 //
7 // http://www.apache.org/licenses/LICENSE-2.0 7 // http://www.apache.org/licenses/LICENSE-2.0
8 // 8 //
9 // Unless required by applicable law or agreed to in writing, software 9 // Unless required by applicable law or agreed to in writing, software
10 // distributed under the License is distributed on an "AS IS" BASIS, 10 // distributed under the License is distributed on an "AS IS" BASIS,
(...skipping 11 matching lines...) Expand all
22 #include "base/strings/sys_string_conversions.h" 22 #include "base/strings/sys_string_conversions.h"
23 23
24 namespace crashpad { 24 namespace crashpad {
25 25
26 launch_data_t CFPropertyToLaunchData(CFPropertyListRef property_cf) { 26 launch_data_t CFPropertyToLaunchData(CFPropertyListRef property_cf) {
27 @autoreleasepool { 27 @autoreleasepool {
28 // This function mixes Foundation and Core Foundation access to property 28 // This function mixes Foundation and Core Foundation access to property
29 // list elements according to which is more convenient and correct for any 29 // list elements according to which is more convenient and correct for any
30 // specific task. 30 // specific task.
31 31
32 launch_data_t data_launch = NULL; 32 launch_data_t data_launch = nullptr;
33 CFTypeID type_id_cf = CFGetTypeID(property_cf); 33 CFTypeID type_id_cf = CFGetTypeID(property_cf);
34 34
35 if (type_id_cf == CFDictionaryGetTypeID()) { 35 if (type_id_cf == CFDictionaryGetTypeID()) {
36 NSDictionary* dictionary_ns = base::mac::CFToNSCast( 36 NSDictionary* dictionary_ns = base::mac::CFToNSCast(
37 base::mac::CFCastStrict<CFDictionaryRef>(property_cf)); 37 base::mac::CFCastStrict<CFDictionaryRef>(property_cf));
38 base::mac::ScopedLaunchData dictionary_launch( 38 base::mac::ScopedLaunchData dictionary_launch(
39 launch_data_alloc(LAUNCH_DATA_DICTIONARY)); 39 launch_data_alloc(LAUNCH_DATA_DICTIONARY));
40 40
41 for (NSString* key in dictionary_ns) { 41 for (NSString* key in dictionary_ns) {
42 if (![key isKindOfClass:[NSString class]]) { 42 if (![key isKindOfClass:[NSString class]]) {
43 return NULL; 43 return nullptr;
44 } 44 }
45 45
46 CFPropertyListRef value_cf = 46 CFPropertyListRef value_cf =
47 static_cast<CFPropertyListRef>([dictionary_ns objectForKey:key]); 47 static_cast<CFPropertyListRef>([dictionary_ns objectForKey:key]);
48 launch_data_t value_launch = CFPropertyToLaunchData(value_cf); 48 launch_data_t value_launch = CFPropertyToLaunchData(value_cf);
49 if (!value_launch) { 49 if (!value_launch) {
50 return NULL; 50 return nullptr;
51 } 51 }
52 52
53 launch_data_dict_insert( 53 launch_data_dict_insert(
54 dictionary_launch, value_launch, [key UTF8String]); 54 dictionary_launch, value_launch, [key UTF8String]);
55 } 55 }
56 56
57 data_launch = dictionary_launch.release(); 57 data_launch = dictionary_launch.release();
58 58
59 } else if (type_id_cf == CFArrayGetTypeID()) { 59 } else if (type_id_cf == CFArrayGetTypeID()) {
60 NSArray* array_ns = base::mac::CFToNSCast( 60 NSArray* array_ns = base::mac::CFToNSCast(
61 base::mac::CFCastStrict<CFArrayRef>(property_cf)); 61 base::mac::CFCastStrict<CFArrayRef>(property_cf));
62 base::mac::ScopedLaunchData array_launch( 62 base::mac::ScopedLaunchData array_launch(
63 launch_data_alloc(LAUNCH_DATA_ARRAY)); 63 launch_data_alloc(LAUNCH_DATA_ARRAY));
64 size_t index = 0; 64 size_t index = 0;
65 65
66 for (id element_ns in array_ns) { 66 for (id element_ns in array_ns) {
67 CFPropertyListRef element_cf = 67 CFPropertyListRef element_cf =
68 static_cast<CFPropertyListRef>(element_ns); 68 static_cast<CFPropertyListRef>(element_ns);
69 launch_data_t element_launch = CFPropertyToLaunchData(element_cf); 69 launch_data_t element_launch = CFPropertyToLaunchData(element_cf);
70 if (!element_launch) { 70 if (!element_launch) {
71 return NULL; 71 return nullptr;
72 } 72 }
73 73
74 launch_data_array_set_index(array_launch, element_launch, index++); 74 launch_data_array_set_index(array_launch, element_launch, index++);
75 } 75 }
76 76
77 data_launch = array_launch.release(); 77 data_launch = array_launch.release();
78 78
79 } else if (type_id_cf == CFNumberGetTypeID()) { 79 } else if (type_id_cf == CFNumberGetTypeID()) {
80 CFNumberRef number_cf = base::mac::CFCastStrict<CFNumberRef>(property_cf); 80 CFNumberRef number_cf = base::mac::CFCastStrict<CFNumberRef>(property_cf);
81 NSNumber* number_ns = base::mac::CFToNSCast(number_cf); 81 NSNumber* number_ns = base::mac::CFToNSCast(number_cf);
(...skipping 14 matching lines...) Expand all
96 } 96 }
97 97
98 case kCFNumberFloat32Type: 98 case kCFNumberFloat32Type:
99 case kCFNumberFloat64Type: 99 case kCFNumberFloat64Type:
100 case kCFNumberFloatType: 100 case kCFNumberFloatType:
101 case kCFNumberDoubleType: { 101 case kCFNumberDoubleType: {
102 data_launch = launch_data_new_real([number_ns doubleValue]); 102 data_launch = launch_data_new_real([number_ns doubleValue]);
103 break; 103 break;
104 } 104 }
105 105
106 default: { return NULL; } 106 default: { return nullptr; }
107 } 107 }
108 108
109 } else if (type_id_cf == CFBooleanGetTypeID()) { 109 } else if (type_id_cf == CFBooleanGetTypeID()) {
110 CFBooleanRef boolean_cf = 110 CFBooleanRef boolean_cf =
111 base::mac::CFCastStrict<CFBooleanRef>(property_cf); 111 base::mac::CFCastStrict<CFBooleanRef>(property_cf);
112 data_launch = launch_data_new_bool(CFBooleanGetValue(boolean_cf)); 112 data_launch = launch_data_new_bool(CFBooleanGetValue(boolean_cf));
113 113
114 } else if (type_id_cf == CFStringGetTypeID()) { 114 } else if (type_id_cf == CFStringGetTypeID()) {
115 NSString* string_ns = base::mac::CFToNSCast( 115 NSString* string_ns = base::mac::CFToNSCast(
116 base::mac::CFCastStrict<CFStringRef>(property_cf)); 116 base::mac::CFCastStrict<CFStringRef>(property_cf));
(...skipping 15 matching lines...) Expand all
132 CFCopyTypeIDDescription(type_id_cf)); 132 CFCopyTypeIDDescription(type_id_cf));
133 DLOG(ERROR) << "unable to convert CFTypeID " << type_id_cf << " (" 133 DLOG(ERROR) << "unable to convert CFTypeID " << type_id_cf << " ("
134 << base::SysCFStringRefToUTF8(type_name_cf) << ")"; 134 << base::SysCFStringRefToUTF8(type_name_cf) << ")";
135 } 135 }
136 136
137 return data_launch; 137 return data_launch;
138 } 138 }
139 } 139 }
140 140
141 } // namespace crashpad 141 } // namespace crashpad
OLDNEW
« no previous file with comments | « util/mac/launchd.h ('k') | util/mac/mac_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698