Bug 1414579 - Port
bug 1412048: replace NS_RUNTIMEABORT() with MOZ_CRASH(). rs=bustage-fix CLOSED TREE
--- a/calendar/base/backend/libical/calUtils.h
+++ b/calendar/base/backend/libical/calUtils.h
@@ -46,17 +46,17 @@ inline nsCOMPtr<calIICSService> getICSSe
* Gets the global timezone service.
*/
inline nsCOMPtr<calITimezoneService> getTimezoneService() {
nsresult rv;
nsCOMPtr<calITimezoneService> tzs;
tzs = do_GetService(CAL_TIMEZONESERVICE_CONTRACTID, &rv);
if (NS_FAILED(rv)) {
- NS_RUNTIMEABORT("Could not load timezone service, brace yourself and prepare for crash");
+ MOZ_CRASH("Could not load timezone service, brace yourself and prepare for crash");
}
return tzs;
}
/**
* Logs an error.
*/
nsresult logError(const nsAString& msg);
@@ -95,32 +95,32 @@ inline nsresult log(nsACString const& ms
* Gets the "UTC" timezone.
*/
inline nsCOMPtr<calITimezone> UTC() {
nsresult rv;
nsCOMPtr<calITimezone> tz;
rv = getTimezoneService()->GetUTC(getter_AddRefs(tz));
if (NS_FAILED(rv)) {
- NS_RUNTIMEABORT("Could not load UTC timezone, brace yourself and prepare for crash");
+ MOZ_CRASH("Could not load UTC timezone, brace yourself and prepare for crash");
}
return tz;
}
/**
* Gets the "floating" timezone
*/
inline nsCOMPtr<calITimezone> floating() {
nsresult rv;
nsCOMPtr<calITimezone> tz;
rv = getTimezoneService()->GetFloating(getter_AddRefs(tz));
if (NS_FAILED(rv)) {
- NS_RUNTIMEABORT("Could not load floating timezone, brace yourself and prepare for crash");
+ MOZ_CRASH("Could not load floating timezone, brace yourself and prepare for crash");
}
return tz;
}
/**
* Returns the libical VTIMEZONE component, null if floating.
*