|
From: <kar...@us...> - 2006-04-05 22:17:37
|
Revision: 1199 Author: karstenw Date: 2006-04-05 15:17:27 -0700 (Wed, 05 Apr 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1199&view=rev Log Message: ----------- parameter unused & name conflict fixes Modified Paths: -------------- Frontier/trunk/Common/source/cancoon.c Frontier/trunk/Common/source/db.c Frontier/trunk/Common/source/langerrorwindow.c Frontier/trunk/Common/source/langmodeless.c Frontier/trunk/Common/source/opinit.c Frontier/trunk/Common/source/opops.c Frontier/trunk/Common/source/osacomponent.c Frontier/trunk/Common/source/services.c Frontier/trunk/Common/source/shellwindowmenu.c Modified: Frontier/trunk/Common/source/cancoon.c =================================================================== --- Frontier/trunk/Common/source/cancoon.c 2006-04-05 22:03:52 UTC (rev 1198) +++ Frontier/trunk/Common/source/cancoon.c 2006-04-05 22:17:27 UTC (rev 1199) @@ -234,7 +234,7 @@ 5.1.5b10 dmb: use ccfindrootwindow to avoid guest databases */ - tyconfigrecord config; + tyconfigrecord lconfig; // 2006-04-03 - kw --- renamed hdlwindowinfo hinfo; // if (shellpushfrontrootglobals ()) @@ -253,9 +253,9 @@ return (true); } - if (shellgetconfig (ccwindowconfigs [ixwindowinfo], &config)) { + if (shellgetconfig (ccwindowconfigs [ixwindowinfo], &lconfig)) { - *rwindow = config.defaultwindowrect; + *rwindow = lconfig.defaultwindowrect; return (true); } @@ -270,20 +270,20 @@ register hdlcancoonrecord hc = hcancoon; tycancoonwindowinfo windowinfo; - tyconfigrecord config; + tyconfigrecord lconfig; // 2006-04-03 - kw --- renamed Rect r; clearbytes (&windowinfo, sizeof (windowinfo)); - if (shellgetconfig (ccwindowconfigs [ixwindowinfo], &config)) { + if (shellgetconfig (ccwindowconfigs [ixwindowinfo], &lconfig)) { - recttodiskrect (&config.defaultwindowrect, &windowinfo.windowrect); + recttodiskrect (&lconfig.defaultwindowrect, &windowinfo.windowrect); - diskgetfontname (config.defaultfont, windowinfo.fontname); + diskgetfontname (lconfig.defaultfont, windowinfo.fontname); - windowinfo.fontnum = config.defaultfont; + windowinfo.fontnum = lconfig.defaultfont; - windowinfo.fontsize = config.defaultsize; + windowinfo.fontsize = lconfig.defaultsize; } else { setrect (&r, -1, -1, -1, -1); @@ -753,7 +753,8 @@ #endif boolean ccloadfile (hdlfilenum fnum, short rnum) { - +#pragma unused(rnum) + /* 9/15/92 dmb: removed support for version1 format; it never shipped @@ -853,7 +854,8 @@ boolean ccloadspecialfile (ptrfilespec fspec, OSType filetype) { - +#pragma unused (filetype) + /* 7/28/92 dmb: use new finder2frontscript to set the Frontier.findertofront global, instead of having Frontier.finder2click always set it to true. also, @@ -914,7 +916,8 @@ boolean ccsavespecialfile (ptrfilespec fs, hdlfilenum fnum, short rnum, boolean flsaveas, boolean flrunnable) { - +#pragma unused(flsaveas, rnum) + /* 6.17.97 dmb: this is called by opverbs, wpverbs, etc. to save a disk file. we leave it to the system.misc.saveWindow script to package the data, @@ -1104,7 +1107,8 @@ boolean ccsavefile (ptrfilespec fs, hdlfilenum fnum, short rnum, boolean flsaveas, boolean flrunnable) { - +#pragma unused(fs, rnum, flrunnable) + /* 5.0b18 dmb: last-minute fix. we crash when saving while publishing a table. the problem is that we toss stuff out during a save, and it would be nearly @@ -1521,7 +1525,10 @@ boolean ccfnumchanged (hdlfilenum newfnum) { - +#ifdef version5orgreater +# pragma unused (newfnum) +#endif + /* part of the implementation of Save As Modified: Frontier/trunk/Common/source/db.c =================================================================== --- Frontier/trunk/Common/source/db.c 2006-04-05 22:03:52 UTC (rev 1198) +++ Frontier/trunk/Common/source/db.c 2006-04-05 22:17:27 UTC (rev 1199) @@ -2346,7 +2346,8 @@ #else boolean dbpushreleasestack (dbaddress adr, long valtype) { - +#pragma unused(valtype) + /* the chunk of db space pointed to by adr is being logically released, but the caller is saying that he doesn't want to make the effects permanent Modified: Frontier/trunk/Common/source/langerrorwindow.c =================================================================== --- Frontier/trunk/Common/source/langerrorwindow.c 2006-04-05 22:03:52 UTC (rev 1198) +++ Frontier/trunk/Common/source/langerrorwindow.c 2006-04-05 22:17:27 UTC (rev 1199) @@ -375,7 +375,8 @@ static boolean langerrorset (bigstring bserror, bigstring bslocation) { - +#pragma unused (bslocation) + /* 2.1b2 dmb: if the langerror window isn't already there, don't try to create it now -- the heap or stack may be dangerously low. instead, @@ -499,7 +500,8 @@ #ifdef flnewfeatures // flstacktrace static boolean langerrorpopupselect (hdlmenu hmenu, short itemselected) { - +#pragma unused (hmenu) + register hdlerrorstack hs = (**langerrordata).herrorstack; short ix; tyerrorrecord *pe; @@ -582,7 +584,8 @@ static boolean langerrormousedown (Point pt, tyclickflags flags) { - +#pragma unused (flags) + /* 7/16/90 DW: wired off the consumption of the error callback, if you want it back on, just switch on the code that's commented out, and the script @@ -680,7 +683,8 @@ boolean langerrordialog (bigstring bsmsg, ptrvoid refcon) { - +#pragma unused (refcon) + unsigned short savedlines, savedchars; if (isemptystring (bsmsg)) /*don't post empty messages -- scipterrror ("") relies on this*/ Modified: Frontier/trunk/Common/source/langmodeless.c =================================================================== --- Frontier/trunk/Common/source/langmodeless.c 2006-04-05 22:03:52 UTC (rev 1198) +++ Frontier/trunk/Common/source/langmodeless.c 2006-04-05 22:17:27 UTC (rev 1199) @@ -130,7 +130,8 @@ static boolean langdialogmousedown (Point pt, tyclickflags flags){ - +#pragma unused (pt, flags) + register hdldialogrecord hd = langdialogdata; short item; @@ -262,7 +263,8 @@ static boolean langdialogadjustcursor (Point pt){ - +#pragma unused (pt) + setcursortype (cursorisarrow); return (true); @@ -539,7 +541,7 @@ register hdldialogrecord hd; Rect rzoom, rwindow; hdlwindowinfo hparent; - tyconfigrecord config; + tyconfigrecord lconfig; DialogTHndl hdlog; bigstring bstitle; @@ -572,11 +574,11 @@ rwindow = (**hdlog).boundsRect; } - shellgetconfig (idlangdialogconfig, &config); + shellgetconfig (idlangdialogconfig, &lconfig); - config.templateresnum = dialogid; + lconfig.templateresnum = dialogid; - shellsetconfig (idlangdialogconfig, config); + shellsetconfig (idlangdialogconfig, lconfig); if (!newchildwindow (idlangdialogconfig, hparent, &rwindow, &rzoom, bstitle, &langdialogwindow)) { Modified: Frontier/trunk/Common/source/opinit.c =================================================================== --- Frontier/trunk/Common/source/opinit.c 2006-04-05 22:03:52 UTC (rev 1198) +++ Frontier/trunk/Common/source/opinit.c 2006-04-05 22:17:27 UTC (rev 1199) @@ -104,7 +104,8 @@ boolean opdefaultreleaserefconroutine (hdlheadrecord hnode, boolean fldisk) { - +#pragma unused (hnode, fldisk) + /* default callback for releasing the refcon, does nothing. note that the callback is responsible for releasing the data linked into the refcon @@ -116,7 +117,8 @@ static boolean opdefaultpushstyle (hdlheadrecord hnode) { - +#pragma unused (hnode) + oppushstyle (outlinedata); return (true); @@ -153,7 +155,8 @@ static boolean opdefaulticon2click (hdlheadrecord hnode) { - +#pragma unused (hnode) + return (false); /*don't consume the double-click*/ } /*opdefaulticon2click*/ Modified: Frontier/trunk/Common/source/opops.c =================================================================== --- Frontier/trunk/Common/source/opops.c 2006-04-05 22:03:52 UTC (rev 1198) +++ Frontier/trunk/Common/source/opops.c 2006-04-05 22:17:27 UTC (rev 1199) @@ -1231,7 +1231,8 @@ static boolean opreleaserefconvisit (hdlheadrecord hnode, ptrvoid refcon) { - +#pragma unused (refcon) + Handle hrefcon = (Handle) (**hnode).hrefcon; if (hrefcon != nil) { /*node has a refcon handle attached*/ @@ -1339,7 +1340,7 @@ #if !fljustpacking - tyconfigrecord config; + tyconfigrecord lconfig; #endif register hdloutlinerecord ho; @@ -1409,15 +1410,15 @@ #if !fljustpacking - shellgetconfig (idoutlineconfig, &config); + shellgetconfig (idoutlineconfig, &lconfig); - (**ho).windowrect = config.defaultwindowrect; + (**ho).windowrect = lconfig.defaultwindowrect; - (**ho).fontnum = config.defaultfont; + (**ho).fontnum = lconfig.defaultfont; - (**ho).fontsize = config.defaultsize; + (**ho).fontsize = lconfig.defaultsize; - (**ho).fontstyle = config.defaultstyle; + (**ho).fontstyle = lconfig.defaultstyle; #endif @@ -1572,7 +1573,8 @@ static boolean opcountvisit (hdlheadrecord hnode, ptrvoid refcon) { - +#pragma unused (hnode) + (*(long*)refcon)++; /*the simplest visit routine*/ return (true); @@ -1633,7 +1635,8 @@ static boolean opresetlevelsvisit (hdlheadrecord hnode, ptrvoid refcon) { - +#pragma unused (refcon) + register hdlheadrecord h = hnode; (**h).headlevel = (**(**h).headlinkleft).headlevel + 1; Modified: Frontier/trunk/Common/source/osacomponent.c =================================================================== --- Frontier/trunk/Common/source/osacomponent.c 2006-04-05 22:03:52 UTC (rev 1198) +++ Frontier/trunk/Common/source/osacomponent.c 2006-04-05 22:17:27 UTC (rev 1199) @@ -910,7 +910,7 @@ pascal OSErr osadefaultactiveproc (long refcon) { - +#pragma unused (refcon) /* see if user pressed cmd-period. @@ -934,18 +934,35 @@ } /*osadefaultactiveproc*/ -static pascal OSErr osadefaultcreate (AEEventClass class, AEEventID id, - const AEAddressDesc *target, short returnID, - long transactionID, AppleEvent *result, long refcon) { - +static pascal OSErr +osadefaultcreate ( + AEEventClass class, + AEEventID id, + const AEAddressDesc *target, + short returnID, + long transactionID, + AppleEvent *result, + long refcon) +{ +#pragma unused (refcon) + return (AECreateAppleEvent(class, id, target, returnID, transactionID, result)); } /*osadefaultcreate*/ -static pascal OSErr osadefaultsend (const AppleEvent *event, AppleEvent *reply, - AESendMode sendmode, AESendPriority priority, long timeout, - AEIdleUPP idleproc, AEFilterUPP filterproc, long refcon) { - +static pascal OSErr +osadefaultsend ( + const AppleEvent *event, + AppleEvent *reply, + AESendMode sendmode, + AESendPriority priority, + long timeout, + AEIdleUPP idleproc, + AEFilterUPP filterproc, + long refcon) +{ +#pragma unused (refcon) + return (AESend (event, reply, sendmode, priority, timeout, idleproc, filterproc)); } /*osadefaultsend*/ @@ -1174,8 +1191,12 @@ static boolean osaerrormessage (bigstring bs, ptrvoid refcon) { - - AEDesc list, rec, desc; +#pragma unused (refcon) + + AEDesc + list, + rec, + desc; long n; OSErr err; @@ -1243,14 +1264,15 @@ } /*osaerrormessage*/ -static pascal OSErr coerceTEXTtoSTXT ( - DescType fromtype, - Ptr pdata, - long size, - DescType totype, - long refcon, - AEDesc *result) { - +static pascal OSErr +coerceTEXTtoSTXT ( + DescType fromtype, + Ptr pdata, + long size, + DescType totype, + long refcon, + AEDesc *result) { +#pragma unused(fromtype, refcon) /* 2.1b2 dmb: don't use clearbytes so we don't have to set up a5 */ @@ -1260,7 +1282,7 @@ AEDesc list; register ScrpSTElement *pstyle; - #ifdef fldegug + #ifdef fldebug // 2006-04-04 - kw --- this was fldegug if (totype != typeStyledText) DebugStr ("\punexpected coercion"); @@ -1308,12 +1330,14 @@ } /*coerceTEXTtoSTXT*/ -static pascal OSErr coerceTypetoObj ( - AEDesc *desc, - DescType totype, - long refcon, - AEDesc *result) { - +static pascal OSErr +coerceTypetoObj ( + AEDesc *desc, + DescType totype, + long refcon, + AEDesc *result) { +#pragma unused(totype, refcon) + /* 2.1b1 dmb: if Frontier passes a string4 identifier where an object specifier is required, this coercion handler will take care of it @@ -1599,6 +1623,7 @@ void osaremovepatch (hdlcomponentglobals hglobals, GNEUPP origproc) { +#pragma unused (origproc) register hdlcomponentglobals hcg = hglobals; @@ -1617,12 +1642,14 @@ #else GNEUPP osainstallpatch (hdlcomponentglobals hglobals) { - +#pragma unused (hglobals) + return (nil); } /*osainstallpatch*/ void osaremovepatch (hdlcomponentglobals hglobals, GNEUPP origproc) { +#pragma unused (hglobals, origproc) } /*osaremovepatch*/ @@ -1665,7 +1692,8 @@ THz osasethomezone (hdlcomponentglobals hglobals) { - +#pragma unused (hglobals) + /* 2.1b13 dmb: added this to balance the setclientzone call, and to allow us to keep the homezone global private. @@ -1806,9 +1834,17 @@ } /*osacreateevent*/ -static pascal OSErr osasendevent (const AppleEvent *event, AppleEvent *reply, - AESendMode mode, AESendPriority priority, long timeout, - AEIdleUPP idleproc, AEFilterUPP filterproc ) { +static pascal OSErr +osasendevent ( + const AppleEvent *event, + AppleEvent *reply, + AESendMode mode, + AESendPriority priority, + long timeout, + AEIdleUPP idleproc, + AEFilterUPP filterproc ) +{ +#pragma unused (idleproc, filterproc) /* 2/16/93 dmb: in case the event is to be direct dispatched correctly, we need @@ -2300,7 +2336,8 @@ static boolean setstorageval (hdlcomponentglobals hglobals, tyvaluerecord *val, OSAID id) { - +#pragma unused (hglobals) + /* add val to the id table using the indicated id. on error, dispose of the value */ @@ -2331,7 +2368,8 @@ static boolean getstorageval (hdlcomponentglobals hglobals, OSAID id, tyvaluerecord *val, hdlhashnode * hnode) { - +#pragma unused (hglobals) + bigstring bs; numbertostring (id, bs); @@ -2348,7 +2386,8 @@ static boolean deletestorageval (hdlcomponentglobals hglobals, OSAID id) { - +#pragma unused (hglobals) + bigstring bs; numbertostring (id, bs); @@ -2463,11 +2502,14 @@ } /*osanewvalue*/ -static pascal OSAError osaLoad ( - hdlcomponentglobals hglobals, - const AEDesc* scriptData, - long modeFlags, - OSAID* resultingCompiledScriptID) { +static pascal OSAError +osaLoad ( + hdlcomponentglobals hglobals, + const AEDesc *scriptData, + long modeFlags, + OSAID *resultingCompiledScriptID) +{ +#pragma unused (modeFlags) /* 2.1b1 dmb: don't insist that the loaded value is a context (i.e. a table) @@ -2828,10 +2870,13 @@ } /*osaSetResumeDispatchProc*/ -static pascal OSAError osaGetResumeDispatchProc ( - hdlcomponentglobals hglobals, - AEEventHandlerUPP* resumeDispatchProc, - long* refCon) { +static pascal OSAError +osaGetResumeDispatchProc ( + hdlcomponentglobals hglobals, + AEEventHandlerUPP *resumeDispatchProc, + long *refCon) +{ +#pragma unused (hglobals) /* we're never invoking the resumedispatch proc, so be honest and return these constants @@ -3085,11 +3130,14 @@ } /*osaGetSource*/ -static pascal OSAError osaCoerceFromDesc ( - hdlcomponentglobals hglobals, - const AEDesc* scriptData, - long modeFlags, - OSAID* resultingScriptID) { +static pascal OSAError +osaCoerceFromDesc ( + hdlcomponentglobals hglobals, + const AEDesc *scriptData, + long modeFlags, + OSAID *resultingScriptID) +{ +#pragma unused (modeFlags) /* 3.0a dmb: fixed leak when val is an externalvaluetype. @@ -3141,12 +3189,15 @@ } /*osaCoerceFromDesc*/ -static pascal OSAError osaCoerceToDesc ( - hdlcomponentglobals hglobals, - OSAID scriptID, - DescType desiredType, - long modeFlags, - AEDesc* result) { +static pascal OSAError +osaCoerceToDesc ( + hdlcomponentglobals hglobals, + OSAID scriptID, + DescType desiredType, + long modeFlags, + AEDesc *result) +{ +#pragma unused (modeFlags) tyvaluerecord val; hdlhashnode hnode; @@ -3190,12 +3241,15 @@ } /*getrecordingstring*/ -static pascal OSErr coerceInsltoTEXT ( - const AEDesc *desc, - DescType totype, - long refcon, - AEDesc *result) { - +static pascal OSErr +coerceInsltoTEXT ( + const AEDesc *desc, + DescType totype, + long refcon, + AEDesc *result) +{ +#pragma unused(totype, refcon) + /* 2.1b2 dmb: this is installed as a typeInsertionLoc -> typeObjectSpecifier coercer, but it's actually generating source text for the recorder. it's @@ -3222,7 +3276,7 @@ long curA5 = SetUpAppA5 (); #endif - #ifdef fldegug + #ifdef fldebug // 2006-04-04 - kw --- this was fldegug if ((*desc).descriptorType != typeInsertionLoc) DebugStr ("\punexpected coercion"); @@ -3325,7 +3379,12 @@ #endif -static pascal OSErr sendrecordingevent (hdlcomponentglobals hglobals, AEEventID id) { +static pascal OSErr +sendrecordingevent ( + hdlcomponentglobals hglobals, + AEEventID id) +{ +#pragma unused (hglobals) /* 2.1b5 dmb: don't use sendproc for these events; they're not part of @@ -3553,11 +3612,17 @@ pushstring (bsval, bsevent); return (noErr); - } /*pusheventparameter*/ +} /*pusheventparameter*/ -static pascal OSErr handlerecordableevent (const AppleEvent *event, AppleEvent *reply, SInt32 refcon) { - +static pascal OSErr +handlerecordableevent ( + const AppleEvent *event, + AppleEvent *reply, + SInt32 refcon) +{ +#pragma unused (reply) + /* map the event to a line of source code, and send the text in a Recorded Text event @@ -4010,10 +4075,13 @@ } /*osaStopRecording*/ -static pascal OSAError osaScriptingComponentName ( - hdlcomponentglobals hglobals, - AEDesc* resultingScriptingComponentName) { - +static pascal OSAError +osaScriptingComponentName ( + hdlcomponentglobals hglobals, + AEDesc *resultingScriptingComponentName) +{ +#pragma unused (hglobals) + bigstring bs; getstringlist (componentlistnumber, usertalkstring, bs); @@ -4061,12 +4129,15 @@ } /*osaExecute*/ -static pascal OSAError osaDisplay ( - hdlcomponentglobals hglobals, - OSAID scriptValueID, - DescType desiredType, - long modeFlags, - AEDesc* resultingText) { +static pascal OSAError +osaDisplay ( + hdlcomponentglobals hglobals, + OSAID scriptValueID, + DescType desiredType, + long modeFlags, + AEDesc *resultingText) +{ +#pragma unused (desiredType, modeFlags) /* ****should handle desiredType other than typechar @@ -4223,11 +4294,14 @@ } /*osaDoScript*/ -static pascal OSAError osaMakeContext ( - hdlcomponentglobals hglobals, - const AEDesc* contextName, - OSAID parentContext, - OSAID* resultingContextID) { +static pascal OSAError +osaMakeContext ( + hdlcomponentglobals hglobals, + const AEDesc *contextName, + OSAID parentContext, + OSAID *resultingContextID) +{ +#pragma unused (contextName, parentContext) tyvaluerecord vcontext; @@ -4479,16 +4553,17 @@ static pascal OSAError osaDebug ( hdlcomponentglobals hglobals, - OSType selector, - const AEDesc* selectorData, - DescType desiredType, - AEDesc* resultingDebugInfoOrDataToSet) { - + OSType selector, + const AEDesc *selectorData, + DescType desiredType, + AEDesc *resultingDebugInfoOrDataToSet) { +#pragma unused (hglobals, desiredType) + OSAError err = noErr; hdlhashnode hnode; - + switch (selector) { - + case kOSADebugRange: { AEDesc rec; @@ -4572,7 +4647,8 @@ static pascal ComponentResult cmpclose (Handle storage, ComponentInstance self) { - +#pragma unused(self) + register hdlcomponentglobals hglobals = (hdlcomponentglobals) storage; if (hglobals != nil) { /*defensive driving -- can be necessary during shutdown*/ @@ -5498,7 +5574,8 @@ static pascal OSErr osaclientactive (long refcon) { - +#pragma unused (refcon) + /* while executing an osa script, we want to check for cmd-period, and allow other threads to run. this does part of the job. @@ -5540,10 +5617,19 @@ } /*osaclientidleproc*/ -static pascal OSErr osaclientsend (const AppleEvent *event, AppleEvent *reply, - AESendMode sendmode, AESendPriority priority, long timeout, - AEIdleUPP idleproc, AEFilterUPP filterproc, long refcon) { - +static pascal OSErr +osaclientsend ( + const AppleEvent *event, + AppleEvent *reply, + AESendMode sendmode, + AESendPriority priority, + long timeout, + AEIdleUPP idleproc, + AEFilterUPP filterproc, + long refcon) +{ +#pragma unused (refcon, idleproc) + /* with AppleScript, at least, the activeproc doesn't get called enough for decent thread cooperation. ideally, we'd send this event using @@ -5926,7 +6012,7 @@ register hdlcomponentglobals hclient; short ctclients; - short idstring; + short lidstring; bigstring bs; bigstring bsprompt; typrocessid psn, lastpsn; @@ -5969,15 +6055,15 @@ if (ctclients > 0) { if (ctclients == 1) - idstring = specificclientstring; + lidstring = specificclientstring; else { numbertostring (ctclients, bs); - idstring = multipleclientsstring; + lidstring = multipleclientsstring; } - if (getrecordingstring (idstring, bsprompt)) { + if (getrecordingstring (lidstring, bsprompt)) { parsedialogstring (bsprompt, bs, nil, nil, nil, bsprompt); Modified: Frontier/trunk/Common/source/services.c =================================================================== --- Frontier/trunk/Common/source/services.c 2006-04-05 22:03:52 UTC (rev 1198) +++ Frontier/trunk/Common/source/services.c 2006-04-05 22:17:27 UTC (rev 1199) @@ -86,7 +86,8 @@ pascal OSStatus serviceshandlercopy (EventHandlerCallRef nextHandler, EventRef inEvent, void* userData) { - +#pragma unused(userData, nextHandler) + /* Copy the current selection to the Services-specific scrap. @@ -138,7 +139,8 @@ pascal OSStatus serviceshandlerpaste (EventHandlerCallRef nextHandler, EventRef inEvent, void* userData) { - +#pragma unused(userData, nextHandler) + ScrapRef servicesscrap, currentscrap; long bytecount; OSErr err; @@ -193,16 +195,29 @@ pascal OSStatus serviceshandlergettypes (EventHandlerCallRef nextHandler, EventRef inEvent, void* userData) { - +#pragma unused(userData, nextHandler) + CFMutableArrayRef copytypes, pastetypes; short ix, count; - GetEventParameter (inEvent, kEventParamServiceCopyTypes, typeCFMutableArrayRef, NULL, - sizeof (CFMutableArrayRef), NULL, ©types); + GetEventParameter ( + inEvent, + kEventParamServiceCopyTypes, + typeCFMutableArrayRef, + NULL, + sizeof (CFMutableArrayRef), + NULL, + ©types); - GetEventParameter (inEvent, kEventParamServicePasteTypes, typeCFMutableArrayRef, NULL, - sizeof (CFMutableArrayRef), NULL, &pastetypes); - + GetEventParameter ( + inEvent, + kEventParamServicePasteTypes, + typeCFMutableArrayRef, + NULL, + sizeof (CFMutableArrayRef), + NULL, + &pastetypes); + count = sizeof (servicesdatatypes) / sizeof (OSType); /*Place our data types in the copytypes and pastetypes arrays. This code is generalized Modified: Frontier/trunk/Common/source/shellwindowmenu.c =================================================================== --- Frontier/trunk/Common/source/shellwindowmenu.c 2006-04-05 22:03:52 UTC (rev 1198) +++ Frontier/trunk/Common/source/shellwindowmenu.c 2006-04-05 22:17:27 UTC (rev 1199) @@ -56,7 +56,8 @@ static boolean pushwindowmenuvisit (WindowPtr w, ptrvoid ptr) { - +#pragma unused (ptr) + /* 3/8/91 dmb: mark the current root item with an asterix, if not checked This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |