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

ios: Rename RAW_LOG to CRASHPAD_RAW_LOG.

Browse Source 
Deconflict with chromium RAW_LOG.

Change-Id: Iac0110f52259595175aaed983ea3ac6136911407
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/2910732
Reviewed-by: Mark Mentovai <mark@chromium.org>
Commit-Queue: Justin Cohen <justincohen@chromium.org>
This commit is contained in:
Justin Cohen 2021-05-20 09:45:54 -04:00 committed by Crashpad LUCI CQ
parent 3a112cfefd
commit 6f8dfc7730
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
util/ios/raw_logging.h
View File

@ -28,10 +28,10 @@ void RawLog(const char* file, int line, const char* message, int error);
} // namespace internal } // namespace internal
} // namespace crashpad } // namespace crashpad
#define RAW_LOG(message) \ #define CRASHPAD_RAW_LOG(message) \
::crashpad::internal::RawLog(__FILE__, __LINE__, message, 0) ::crashpad::internal::RawLog(__FILE__, __LINE__, message, 0)
#define RAW_LOG_ERROR(error, message) \ #define CRASHPAD_RAW_LOG_ERROR(error, message) \
::crashpad::internal::RawLog(__FILE__, __LINE__, message, error) ::crashpad::internal::RawLog(__FILE__, __LINE__, message, error)
#endif // CRASHPAD_UTIL_IOS_EXCEPTION_LOGGING_H_ #endif // CRASHPAD_UTIL_IOS_EXCEPTION_LOGGING_H_

6
util/ios/scoped_vm_read.cc
View File

@ -27,7 +27,7 @@ ScopedVMReadInternal::~ScopedVMReadInternal() {
kern_return_t kr = kern_return_t kr =
vm_deallocate(mach_task_self(), vm_read_data_, vm_read_data_count_); vm_deallocate(mach_task_self(), vm_read_data_, vm_read_data_count_);
if (kr != KERN_SUCCESS) if (kr != KERN_SUCCESS)
RAW_LOG_ERROR(kr, "vm_deallocate"); CRASHPAD_RAW_LOG_ERROR(kr, "vm_deallocate");
} }
} }
@ -36,7 +36,7 @@ bool ScopedVMReadInternal::Read(const void* data, const size_t data_length) {
kern_return_t kr = kern_return_t kr =
vm_deallocate(mach_task_self(), vm_read_data_, vm_read_data_count_); vm_deallocate(mach_task_self(), vm_read_data_, vm_read_data_count_);
if (kr != KERN_SUCCESS) if (kr != KERN_SUCCESS)
RAW_LOG_ERROR(kr, "vm_deallocate"); CRASHPAD_RAW_LOG_ERROR(kr, "vm_deallocate");
data_ = 0; data_ = 0;
} }
vm_address_t data_address = reinterpret_cast<vm_address_t>(data); vm_address_t data_address = reinterpret_cast<vm_address_t>(data);
@ -53,7 +53,7 @@ bool ScopedVMReadInternal::Read(const void* data, const size_t data_length) {
data_ = vm_read_data_ + (data_address - page_region_address); data_ = vm_read_data_ + (data_address - page_region_address);
return true; return true;
} else { } else {
RAW_LOG_ERROR(kr, "vm_read"); CRASHPAD_RAW_LOG_ERROR(kr, "vm_read");
return false; return false;
} }
} }