From c032c54b84da6d1235f9afeb4b92a87b2af2f55e Mon Sep 17 00:00:00 2001 From: Chris Peterson Date: Sun, 3 Feb 2019 00:02:30 -0800 Subject: [PATCH] Bug 1507049 - Rename GeckoCrashOOL GeckoCrash. r=froydnj Differential Revision: https://phabricator.services.mozilla.com/D18514 --HG-- extra : rebase_source : 914b4be6452a4a9a70b41281c0c5b0da7ee03921 extra : source : 7f11397ea19118d872f1f793f3d70985af994876 --- toolkit/library/rust/shared/lib.rs | 8 ++++---- toolkit/xre/nsAppRunner.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/toolkit/library/rust/shared/lib.rs b/toolkit/library/rust/shared/lib.rs index 539673c1f378..3fffdb0e6d33 100644 --- a/toolkit/library/rust/shared/lib.rs +++ b/toolkit/library/rust/shared/lib.rs @@ -157,7 +157,7 @@ pub extern "C" fn intentional_panic(message: *const c_char) { extern "C" { // We can't use MOZ_Crash directly because it may be weakly linked // to libxul, and rust can't handle that. - fn GeckoCrashOOL(filename: *const c_char, line: c_int, reason: *const c_char) -> !; + fn GeckoCrash(filename: *const c_char, line: c_int, reason: *const c_char) -> !; } /// Truncate a string at the closest unicode character boundary @@ -226,12 +226,12 @@ fn panic_hook(info: &panic::PanicInfo) { }; // Copy the message and filename to the stack in order to safely add // a terminating nul character (since rust strings don't come with one - // and GeckoCrashOOL wants one). + // and GeckoCrash wants one). let message = ArrayCString::<[_; 512]>::from(message); let filename = ArrayCString::<[_; 512]>::from(filename); unsafe { - GeckoCrashOOL(filename.as_ptr() as *const c_char, line as c_int, - message.as_ptr() as *const c_char); + GeckoCrash(filename.as_ptr() as *const c_char, line as c_int, + message.as_ptr() as *const c_char); } } diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 3559f67ad241..33f30adf98ac 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -5194,8 +5194,8 @@ void XRE_EnableSameExecutableForContentProc() { extern "C" void GeckoHandleOOM(size_t size) { mozalloc_handle_oom(size); } // Similarly, this wraps MOZ_Crash -extern "C" void GeckoCrashOOL(const char* aFilename, int aLine, - const char* aReason) { +extern "C" void GeckoCrash(const char* aFilename, int aLine, + const char* aReason) { MOZ_Crash(aFilename, aLine, aReason); }