3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2025-03-09 22:26:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

util/mac: Provide wrappers for <launch.h> functions deprecated in 10.10.

Browse Source 
A few stragglers were missing from bc401f6aac22. I really don’t know how
that’s possible, since I thought I was testing it with the correct SDK.
I guess I wasn’t.

BUG=crashpad:11
R=rsesek@chromium.org

Review URL: https://codereview.chromium.org/978883007
This commit is contained in:
Mark Mentovai 2015-03-08 15:12:40 -04:00
parent bc401f6aac
commit 88690cece3
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
util/mac/service_management.cc
View File

@ -30,7 +30,7 @@ launch_data_t LaunchDataDictionaryForJob(const std::string& label) {
LaunchDataDictInsert( LaunchDataDictInsert(
request, LaunchDataNewString(label.c_str()), LAUNCH_KEY_GETJOB); request, LaunchDataNewString(label.c_str()), LAUNCH_KEY_GETJOB);
base::mac::ScopedLaunchData response(launch_msg(request)); base::mac::ScopedLaunchData response(LaunchMsg(request));
if (LaunchDataGetType(response) != LAUNCH_DATA_DICTIONARY) { if (LaunchDataGetType(response) != LAUNCH_DATA_DICTIONARY) {
return nullptr; return nullptr;
} }
@ -52,8 +52,7 @@ bool ServiceManagementSubmitJob(CFDictionaryRef job_cf) {
base::mac::ScopedLaunchData request(LaunchDataAlloc(LAUNCH_DATA_DICTIONARY)); base::mac::ScopedLaunchData request(LaunchDataAlloc(LAUNCH_DATA_DICTIONARY));
LaunchDataDictInsert(request, jobs.release(), LAUNCH_KEY_SUBMITJOB); LaunchDataDictInsert(request, jobs.release(), LAUNCH_KEY_SUBMITJOB);
base::mac::ScopedLaunchData response(launch_msg(request)); base::mac::ScopedLaunchData response(LaunchMsg(request));
if (LaunchDataGetType(response) != LAUNCH_DATA_ARRAY) { if (LaunchDataGetType(response) != LAUNCH_DATA_ARRAY) {
return false; return false;
} }
@ -80,7 +79,7 @@ bool ServiceManagementRemoveJob(const std::string& label, bool wait) {
LaunchDataDictInsert( LaunchDataDictInsert(
request, LaunchDataNewString(label.c_str()), LAUNCH_KEY_REMOVEJOB); request, LaunchDataNewString(label.c_str()), LAUNCH_KEY_REMOVEJOB);
base::mac::ScopedLaunchData response(launch_msg(request)); base::mac::ScopedLaunchData response(LaunchMsg(request));
if (LaunchDataGetType(response) != LAUNCH_DATA_ERRNO) { if (LaunchDataGetType(response) != LAUNCH_DATA_ERRNO) {
return false; return false;
} }
@ -131,7 +130,7 @@ pid_t ServiceManagementIsJobRunning(const std::string& label) {
return 0; return 0;
} }
return launch_data_get_integer(pid); return LaunchDataGetInteger(pid);
} }
} // namespace crashpad } // namespace crashpad