From 9ea8d4c86b0c17453aee8cb1ae9cdfa6dac13047 Mon Sep 17 00:00:00 2001 From: "timeless%mac.com" Date: Mon, 2 Sep 2002 21:26:11 +0000 Subject: [PATCH] Bug 161945 clean up simple mac build warnings r=dbradley sr=bz git-svn-id: svn://10.0.0.236/trunk@128679 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/gfx/src/mac/nsNativeThemeMac.cpp | 3 ++- mozilla/layout/generic/nsHTMLReflowState.cpp | 3 +-- .../layout/html/base/src/nsHTMLReflowState.cpp | 3 +-- .../mailnews/compose/src/nsMsgAppleEncode.cpp | 9 +++++---- .../modules/plugin/samples/default/mac/npmac.cpp | 14 +++++++------- .../typelib/xpidl/macplugin/mac_xpidl_panel.cpp | 16 ++++++++++++---- .../appleevents/nsAEApplicationClass.cpp | 13 ++++++------- .../bookmarks/src/nsBookmarksService.cpp | 8 +++----- .../xpinstall/wizard/mac/src/MacInstallWizard.h | 2 +- mozilla/xpinstall/wizard/mac/src/SetupTypeWin.c | 2 -- 10 files changed, 38 insertions(+), 35 deletions(-) diff --git a/mozilla/gfx/src/mac/nsNativeThemeMac.cpp b/mozilla/gfx/src/mac/nsNativeThemeMac.cpp index bae9f6e3d8f..e6f4379d5f7 100644 --- a/mozilla/gfx/src/mac/nsNativeThemeMac.cpp +++ b/mozilla/gfx/src/mac/nsNativeThemeMac.cpp @@ -656,10 +656,11 @@ nsNativeThemeMac::DrawWidgetBackground(nsIRenderingContext* aContext, nsIFrame* nsTransform2D* transformMatrix; aContext->GetCurrentTransform(transformMatrix); nsRect transRect(aRect), transClipRect(aClipRect); - Rect macRect, clipRect; + Rect macRect; transformMatrix->TransformCoord(&transRect.x, &transRect.y, &transRect.width, &transRect.height); ConvertGeckoToNativeRect(transRect, macRect); #ifdef CLIP_DRAWING + Rect clipRect; transformMatrix->TransformCoord(&transClipRect.x, &transClipRect.y, &transClipRect.width, &transClipRect.height); ConvertGeckoToNativeRect(transClipRect, clipRect); ::ClipRect(&clipRect); diff --git a/mozilla/layout/generic/nsHTMLReflowState.cpp b/mozilla/layout/generic/nsHTMLReflowState.cpp index 199371e5db5..fcb9e425964 100644 --- a/mozilla/layout/generic/nsHTMLReflowState.cpp +++ b/mozilla/layout/generic/nsHTMLReflowState.cpp @@ -2275,10 +2275,9 @@ GetNormalLineHeight(nsIFontMetrics* aFontMetrics) NS_PRECONDITION(nsnull != aFontMetrics, "no font metrics"); nscoord normalLineHeight; - nscoord emHeight; #ifdef FONT_LEADING_APIS_V2 - nscoord externalLeading, internalLeading; + nscoord externalLeading, internalLeading, emHeight; aFontMetrics->GetExternalLeading(externalLeading); aFontMetrics->GetInternalLeading(internalLeading); aFontMetrics->GetEmHeight(emHeight); diff --git a/mozilla/layout/html/base/src/nsHTMLReflowState.cpp b/mozilla/layout/html/base/src/nsHTMLReflowState.cpp index 199371e5db5..fcb9e425964 100644 --- a/mozilla/layout/html/base/src/nsHTMLReflowState.cpp +++ b/mozilla/layout/html/base/src/nsHTMLReflowState.cpp @@ -2275,10 +2275,9 @@ GetNormalLineHeight(nsIFontMetrics* aFontMetrics) NS_PRECONDITION(nsnull != aFontMetrics, "no font metrics"); nscoord normalLineHeight; - nscoord emHeight; #ifdef FONT_LEADING_APIS_V2 - nscoord externalLeading, internalLeading; + nscoord externalLeading, internalLeading, emHeight; aFontMetrics->GetExternalLeading(externalLeading); aFontMetrics->GetInternalLeading(internalLeading); aFontMetrics->GetEmHeight(emHeight); diff --git a/mozilla/mailnews/compose/src/nsMsgAppleEncode.cpp b/mozilla/mailnews/compose/src/nsMsgAppleEncode.cpp index 67ef4c618e1..9b6c4ca9725 100755 --- a/mozilla/mailnews/compose/src/nsMsgAppleEncode.cpp +++ b/mozilla/mailnews/compose/src/nsMsgAppleEncode.cpp @@ -137,12 +137,9 @@ int ap_encode_file_infor( ap_entry entries[NUM_ENTRIES]; ap_dates dates; short i; - long comlen, procID; + long comlen; DateTimeRec cur_time; unsigned long cur_secs; - IOParam vinfo; - GetVolParmsInfoBuffer vp; - DTPBRec dtp; char comment[256]; Str63 fname; int status; @@ -164,9 +161,12 @@ int ap_encode_file_infor( // not sure why working directories are needed here... comlen = 0; #else + long procID; procID = 0; GetWDInfo(p_ap_encode_obj->vRefNum, &fpb->ioVRefNum, &fpb->ioDirID, &procID); + IOParam vinfo; memset((void *) &vinfo, '\0', sizeof (vinfo)); + GetVolParmsInfoBuffer vp; vinfo.ioCompletion = nil; vinfo.ioVRefNum = fpb->ioVRefNum; vinfo.ioBuffer = (Ptr) &vp; @@ -175,6 +175,7 @@ int ap_encode_file_infor( if (PBHGetVolParmsSync((HParmBlkPtr) &vinfo) == noErr && ((vp.vMAttrib >> bHasDesktopMgr) & 1)) { + DTPBRec dtp; memset((void *) &dtp, '\0', sizeof (dtp)); dtp.ioVRefNum = fpb->ioVRefNum; if (PBDTGetPath(&dtp) == noErr) diff --git a/mozilla/modules/plugin/samples/default/mac/npmac.cpp b/mozilla/modules/plugin/samples/default/mac/npmac.cpp index 6fcb0138a21..63ca73d0937 100644 --- a/mozilla/modules/plugin/samples/default/mac/npmac.cpp +++ b/mozilla/modules/plugin/samples/default/mac/npmac.cpp @@ -456,13 +456,7 @@ jobject Private_GetJavaClass(void) void SetUpQD(void); void SetUpQD(void) { - ProcessSerialNumber PSN; - FSSpec myFSSpec; - Str63 name; - ProcessInfoRec infoRec; OSErr result = noErr; - CFragConnectionID connID; - Str255 errName; // // Memorize the pluginŐs resource file @@ -477,7 +471,8 @@ void SetUpQD(void) long response; OSErr err = Gestalt(gestaltCFMAttr, &response); Boolean hasCFM = BitTst(&response, 31-gestaltCFMPresent); - + + ProcessInfoRec infoRec; if (hasCFM) { // @@ -485,10 +480,13 @@ void SetUpQD(void) // will give us back the name and FSSpec of the application. // See the Process Manager in IM. // + Str63 name; + FSSpec myFSSpec; infoRec.processInfoLength = sizeof(ProcessInfoRec); infoRec.processName = name; infoRec.processAppSpec = &myFSSpec; + ProcessSerialNumber PSN; PSN.highLongOfPSN = 0; PSN.lowLongOfPSN = kCurrentProcess; @@ -502,6 +500,7 @@ void SetUpQD(void) // result = -1; + CFragConnectionID connID; if (result == noErr) { // @@ -511,6 +510,7 @@ void SetUpQD(void) // returns an error, we assume the app must be 68K. // Ptr mainAddr; + Str255 errName; result = GetDiskFragment(infoRec.processAppSpec, 0L, 0L, infoRec.processName, kLoadCFrag, &connID, (Ptr*)&mainAddr, errName); } diff --git a/mozilla/xpcom/typelib/xpidl/macplugin/mac_xpidl_panel.cpp b/mozilla/xpcom/typelib/xpidl/macplugin/mac_xpidl_panel.cpp index 18325fb57a4..b046071d6d8 100644 --- a/mozilla/xpcom/typelib/xpidl/macplugin/mac_xpidl_panel.cpp +++ b/mozilla/xpcom/typelib/xpidl/macplugin/mac_xpidl_panel.cpp @@ -407,12 +407,12 @@ static void Validate(Handle original, Handle current, Boolean *recompile, Boolea */ static short GetPref(AEKeyword keyword, AEDesc *prefsDesc, Handle settings) { +#if 0 XPIDLSettings prefsData = ** (XPIDLSettingsHandle) settings; DescType anEnum; OSErr err; switch (keyword) { -#if 0 case prefsLN_GenerateSymFile: err = AECreateDesc(typeBoolean, &prefsData.linksym, sizeof(Boolean), prefsDesc); break; @@ -433,7 +433,6 @@ static short GetPref(AEKeyword keyword, AEDesc *prefsDesc, Handle settings) case prefsPR_FileName: err = AECreateDesc(typeChar, prefsData.outfile+1, StrLength(prefsData.outfile), prefsDesc); break; -#endif default: err = errAECantHandleClass; @@ -441,6 +440,9 @@ static short GetPref(AEKeyword keyword, AEDesc *prefsDesc, Handle settings) } return (err); +#else + return (errAECantHandleClass); +#endif } /* @@ -450,6 +452,7 @@ static short GetPref(AEKeyword keyword, AEDesc *prefsDesc, Handle settings) static short SetPref(AEKeyword keyword, const AEDesc *prefsDesc, Handle settings) { +#if 0 XPIDLSettings prefsData = ** (XPIDLSettingsHandle) settings; AEDesc toDesc = { typeNull, NULL }; OSErr err = noErr; @@ -459,7 +462,6 @@ static short SetPref(AEKeyword keyword, const AEDesc *prefsDesc, Handle settings switch (keyword) { -#if 0 case prefsLN_GenerateSymFile: if (prefsDesc->descriptorType == typeBoolean) { @@ -517,7 +519,6 @@ static short SetPref(AEKeyword keyword, const AEDesc *prefsDesc, Handle settings prefsData.outfile[0] = textLength; } break; -#endif default: err = errAECantHandleClass; @@ -532,6 +533,9 @@ static short SetPref(AEKeyword keyword, const AEDesc *prefsDesc, Handle settings AEDisposeDesc(&toDesc); return (err); +#else + return (errAECantHandleClass); +#endif } /* @@ -634,10 +638,12 @@ static void OutlineRect(const Rect* focusRect, Boolean outlineOn) */ static OSErr DragEnter(PanelParameterBlock *pb) { +#if 0 short theItem = pb->itemHit - pb->baseItems; unsigned short itemCount; Rect itemRect; OSErr err; +#endif /* Return paramErr if the user is on a item that can't be dropped on */ return (paramErr); @@ -679,7 +685,9 @@ static void DragExit(PanelParameterBlock *pb) */ static void DragDrop(PanelParameterBlock *pb) { +#if 0 Rect itemRect; +#endif /// SysBreakStr("\preqDragDrop"); diff --git a/mozilla/xpfe/bootstrap/appleevents/nsAEApplicationClass.cpp b/mozilla/xpfe/bootstrap/appleevents/nsAEApplicationClass.cpp index 40e21a2239c..5f352718d53 100644 --- a/mozilla/xpfe/bootstrap/appleevents/nsAEApplicationClass.cpp +++ b/mozilla/xpfe/bootstrap/appleevents/nsAEApplicationClass.cpp @@ -665,11 +665,6 @@ void AEApplicationClass::GetDataFromObject(const AEDesc *token, AEDesc *desiredT void AEApplicationClass::SetDataForObject(const AEDesc *token, AEDesc *data) { OSErr err = noErr; - - long numItems; - long index; - AEKeyword theAEKeyword; - ConstAETokenDesc tokenDesc(token); Boolean usePropertyCode = tokenDesc.UsePropertyCode(); DescType propertyCode; @@ -678,13 +673,16 @@ void AEApplicationClass::SetDataForObject(const AEDesc *token, AEDesc *data) { propertyCode = tokenDesc.GetPropertyCode(); +#if !TARGET_CARBON + long numItems; +#endif switch (propertyCode) { // the clipboard is the only writeable property for the application object case pClipboard: // The data should be an AE list containing a series of things to be placed on the // clipboard. The data type of each item is also the clipboard type for that data -#if !TARGET_CARBON +#if !TARGET_CARBON err = ZeroScrap(); ThrowIfOSErr(err); @@ -692,9 +690,10 @@ void AEApplicationClass::SetDataForObject(const AEDesc *token, AEDesc *data) // Copy each item onto the clipboard - for (index = 1; index <= numItems; index++) + for (long index = 1; index <= numItems; index++) { StAEDesc currentItemDesc; + AEKeyword theAEKeyword; err = AEGetNthDesc(data, index, typeWildCard, &theAEKeyword, ¤tItemDesc); ThrowIfOSErr(err); diff --git a/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp b/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp index 6642628c246..5c3888ea55e 100644 --- a/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp +++ b/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp @@ -3291,11 +3291,11 @@ nsBookmarksService::ParseFavoritesFolder(nsIFile* aDirectory, nsIRDFResource* aP NS_IMETHODIMP nsBookmarksService::ImportSystemBookmarks(nsIRDFResource* aParentFolder) { - nsresult rv; - gImportedSystemBookmarks = PR_TRUE; #ifdef XP_WIN + nsresult rv; + nsCOMPtr fileLocator(do_GetService("@mozilla.org/file/directory_service;1", &rv)); if (NS_FAILED(rv)) return rv; @@ -3309,7 +3309,6 @@ nsBookmarksService::ImportSystemBookmarks(nsIRDFResource* aParentFolder) // read Favorites folder if it exists on the machine. if (favoritesDirectory) return ParseFavoritesFolder(favoritesDirectory, aParentFolder); - #elif XP_MAC nsSpecialSystemDirectory ieFavoritesFile(nsSpecialSystemDirectory::Mac_PreferencesDirectory); ieFavoritesFile += "Explorer"; @@ -3320,9 +3319,8 @@ nsBookmarksService::ImportSystemBookmarks(nsIRDFResource* aParentFolder) BeginUpdateBatch(this); parser.Parse(aParentFolder, kNC_Bookmark); EndUpdateBatch(this); - - return NS_OK; #endif + return NS_OK; } diff --git a/mozilla/xpinstall/wizard/mac/src/MacInstallWizard.h b/mozilla/xpinstall/wizard/mac/src/MacInstallWizard.h index 09e0972ca49..312a7f23ea7 100644 --- a/mozilla/xpinstall/wizard/mac/src/MacInstallWizard.h +++ b/mozilla/xpinstall/wizard/mac/src/MacInstallWizard.h @@ -72,7 +72,7 @@ err = _funcCall; \ if (err) \ { \ ErrorHandler(err, _msg); \ - return; \ + return _rv; \ } #define ERR_CHECK_RET(_funcCall, _rv) \ diff --git a/mozilla/xpinstall/wizard/mac/src/SetupTypeWin.c b/mozilla/xpinstall/wizard/mac/src/SetupTypeWin.c index 951189a723f..224eda0ba21 100644 --- a/mozilla/xpinstall/wizard/mac/src/SetupTypeWin.c +++ b/mozilla/xpinstall/wizard/mac/src/SetupTypeWin.c @@ -50,8 +50,6 @@ ShowSetupTypeWin(void) long txtSize; Str255 instLocTitle, selectFolder; GrafPtr oldPort; - ProcessSerialNumber thePSN; - FSSpec theSpec; GetPort(&oldPort);