From cea017e630d687ef0b88aaf2f9c299ea55fecd1b Mon Sep 17 00:00:00 2001 From: "joshmoz%gmail.com" Date: Mon, 23 Apr 2007 05:33:57 +0000 Subject: [PATCH] get rid of the rest of PR_Malloc and PR_Free usage from cocoa widgets. Who knows why using it here doesn't cause a linking problem but using it in the menu code does... followup, b=363574 git-svn-id: svn://10.0.0.236/trunk@224870 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/widget/src/cocoa/nsPrintSettingsX.mm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mozilla/widget/src/cocoa/nsPrintSettingsX.mm b/mozilla/widget/src/cocoa/nsPrintSettingsX.mm index ffb2b9f6968..3adb6a55ca9 100644 --- a/mozilla/widget/src/cocoa/nsPrintSettingsX.mm +++ b/mozilla/widget/src/cocoa/nsPrintSettingsX.mm @@ -340,13 +340,13 @@ NS_IMETHODIMP nsPrintSettingsX::ReadPageFormatFromPrefs() PRUint32 maximumDataSize = (encodedDataLen * 3) / 4 - sizeof(FrozenHandle); PRUint32 minimumDataSize = maximumDataSize - 2; if (handleSize > maximumDataSize || handleSize < minimumDataSize) { - PR_Free(frozenHandle); + free(frozenHandle); return NS_ERROR_FAILURE; } Handle decodedDataHandle = nsnull; OSErr err = ::PtrToHand(frozenHandle->data, &decodedDataHandle, handleSize); - PR_Free(frozenHandle); + free(frozenHandle); if (err != noErr) return NS_ERROR_OUT_OF_MEMORY; @@ -398,7 +398,7 @@ NS_IMETHODIMP nsPrintSettingsX::WritePageFormatToPrefs() // the correct size. PRUint32 dataSize = ::GetHandleSize(pageFormatHandle); PRUint32 frozenDataSize = sizeof(FrozenHandle) + dataSize; - FrozenHandle* frozenHandle = (FrozenHandle*)PR_Malloc(frozenDataSize); + FrozenHandle* frozenHandle = (FrozenHandle*)malloc(frozenDataSize); if (!frozenHandle) return NS_ERROR_OUT_OF_MEMORY; @@ -408,7 +408,7 @@ NS_IMETHODIMP nsPrintSettingsX::WritePageFormatToPrefs() nsXPIDLCString encodedData; encodedData.Adopt(::PL_Base64Encode((char*)frozenHandle, frozenDataSize, nsnull)); - PR_Free(frozenHandle); + free(frozenHandle); if (!encodedData.get()) return NS_ERROR_OUT_OF_MEMORY;