зеркало из https://github.com/mozilla/pjs.git
Fix SunOS build bustage + wrongly typed return value in landing of bug 395277, a=build-bustage
This commit is contained in:
Родитель
09f591ff6a
Коммит
fbabce2293
|
@ -246,7 +246,7 @@ nsOSHelperAppService::GetProtocolHandlerInfoFromOS(const nsACString &aScheme,
|
|||
|
||||
nsMIMEInfoBeOS *handlerInfo =
|
||||
new nsMIMEInfoBeOS(aScheme, nsMIMEInfoBase::eProtocolInfo);
|
||||
NS_ENSURE_TRUE(handlerInfo, nsnull);
|
||||
NS_ENSURE_TRUE(handlerInfo, NS_ERROR_OUT_OF_MEMORY);
|
||||
NS_ADDREF(*_retval = handlerInfo);
|
||||
|
||||
if (!*found) {
|
||||
|
|
|
@ -307,7 +307,7 @@ nsOSHelperAppService::GetProtocolHandlerInfoFromOS(const nsACString &aScheme,
|
|||
|
||||
nsMIMEInfoMac *handlerInfo =
|
||||
new nsMIMEInfoMac(aScheme, nsMIMEInfoBase::eProtocolInfo);
|
||||
NS_ENSURE_TRUE(handlerInfo, nsnull);
|
||||
NS_ENSURE_TRUE(handlerInfo, NS_ERROR_OUT_OF_MEMORY);
|
||||
NS_ADDREF(*_retval = handlerInfo);
|
||||
|
||||
if (!*found) {
|
||||
|
|
|
@ -925,7 +925,7 @@ nsExternalHelperAppService::GetProtocolHandlerInfoFromOS(const nsACString &aSche
|
|||
|
||||
NS_IMETHODIMP
|
||||
nsExternalHelperAppService::SetProtocolHandlerDefaults(nsIHandlerInfo *aHandlerInfo,
|
||||
const PRBool aOSHandlerExists)
|
||||
PRBool aOSHandlerExists)
|
||||
{
|
||||
// this type isn't in our database, so we've only got an OS default handler,
|
||||
// if one exists
|
||||
|
|
|
@ -1622,7 +1622,7 @@ nsOSHelperAppService::GetProtocolHandlerInfoFromOS(const nsACString &aScheme,
|
|||
|
||||
nsMIMEInfoOS2 *handlerInfo =
|
||||
new nsMIMEInfoOS2(aScheme, nsMIMEInfoBase::eProtocolInfo);
|
||||
NS_ENSURE_TRUE(handlerInfo, nsnull);
|
||||
NS_ENSURE_TRUE(handlerInfo, NS_ERROR_OUT_OF_MEMORY);
|
||||
NS_ADDREF(*_retval = handlerInfo);
|
||||
|
||||
if (!*found) {
|
||||
|
|
|
@ -1647,7 +1647,7 @@ nsOSHelperAppService::GetProtocolHandlerInfoFromOS(const nsACString &aScheme,
|
|||
|
||||
nsMIMEInfoUnix *handlerInfo =
|
||||
new nsMIMEInfoUnix(aScheme, nsMIMEInfoBase::eProtocolInfo);
|
||||
NS_ENSURE_TRUE(handlerInfo, nsnull);
|
||||
NS_ENSURE_TRUE(handlerInfo, NS_ERROR_OUT_OF_MEMORY);
|
||||
NS_ADDREF(*_retval = handlerInfo);
|
||||
|
||||
if (!*found) {
|
||||
|
|
|
@ -602,7 +602,7 @@ nsOSHelperAppService::GetProtocolHandlerInfoFromOS(const nsACString &aScheme,
|
|||
|
||||
nsMIMEInfoWin *handlerInfo =
|
||||
new nsMIMEInfoWin(aScheme, nsMIMEInfoBase::eProtocolInfo);
|
||||
NS_ENSURE_TRUE(handlerInfo, nsnull);
|
||||
NS_ENSURE_TRUE(handlerInfo, NS_ERROR_OUT_OF_MEMORY);
|
||||
NS_ADDREF(*_retval = handlerInfo);
|
||||
|
||||
if (!*found) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче