Menu
▾
▴
SF.net SVN: frontierkernel: [1206] Frontier/trunk/Common/source
|
From: <kar...@us...> - 2006-04-05 23:21:38
|
Revision: 1206 Author: karstenw Date: 2006-04-05 16:21:19 -0700 (Wed, 05 Apr 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1206&view=rev Log Message: ----------- parameter unused & name conflict fixes Modified Paths: -------------- Frontier/trunk/Common/source/bitmaps.c Frontier/trunk/Common/source/fileops.c Frontier/trunk/Common/source/langpython.c Frontier/trunk/Common/source/langverbs.c Frontier/trunk/Common/source/miniwindow.c Frontier/trunk/Common/source/mouse.c Frontier/trunk/Common/source/odbengine.c Frontier/trunk/Common/source/opedit.c Frontier/trunk/Common/source/opstructure.c Frontier/trunk/Common/source/opverbs.c Frontier/trunk/Common/source/tabledisplay.c Frontier/trunk/Common/source/wpverbs.c Modified: Frontier/trunk/Common/source/bitmaps.c =================================================================== --- Frontier/trunk/Common/source/bitmaps.c 2006-04-05 23:08:41 UTC (rev 1205) +++ Frontier/trunk/Common/source/bitmaps.c 2006-04-05 23:21:19 UTC (rev 1206) @@ -163,7 +163,8 @@ static void closeworld (WindowPtr w) { - +#pragma unused(w) + /* 2/8/91 dmb: experiments show that we get better performance tossing the gworld every time that we do using updategworld on the same one. @@ -200,7 +201,8 @@ static boolean openmono (Rect r, WindowPtr w) { - +#pragma unused(w) + register short nrowbytes; register long nboxbytes; register long sizehandle; @@ -362,6 +364,7 @@ //Code change by Timothy Paustian Sunday, May 7, 2000 10:56:54 PM //Changed to Opaque call for Carbon #if ACCESSOR_CALLS_ARE_FUNCTIONS == 1 + #pragma unused(trapnum) //always return false for traps since this not allowed in carbon //This really is not needed but what the heck return false; Modified: Frontier/trunk/Common/source/fileops.c =================================================================== --- Frontier/trunk/Common/source/fileops.c 2006-04-05 23:08:41 UTC (rev 1205) +++ Frontier/trunk/Common/source/fileops.c 2006-04-05 23:21:19 UTC (rev 1206) @@ -2242,13 +2242,13 @@ boolean lockvolume (const tyfilespec *fs, boolean fllock) { -#if TARGET_API_MAC_CARBON +#ifdef MACVERSION +#if TARGET_API_MAC_CARBON == 1 #pragma unused (fs, fllock) //Code change by Timothy Paustian Sunday, June 25, 2000 9:19:49 PM //can't lock volumes in carbon. return false; -#endif -#if (defined(MACVERSION) && TARGET_API_MAC_CARBON != 1) +#else short vnum; QHdrPtr vqtop; QElemPtr vqelem; @@ -2282,6 +2282,7 @@ } #endif +#endif #ifdef WIN95VERSION return (false); #endif Modified: Frontier/trunk/Common/source/langpython.c =================================================================== --- Frontier/trunk/Common/source/langpython.c 2006-04-05 23:08:41 UTC (rev 1205) +++ Frontier/trunk/Common/source/langpython.c 2006-04-05 23:21:19 UTC (rev 1206) @@ -125,6 +125,7 @@ #else boolean langrunpythonscript (hdltreenode hp1, tyvaluerecord *v) { +#pragma unused(hp1, v) langerror (unimplementedverberror); Modified: Frontier/trunk/Common/source/langverbs.c =================================================================== --- Frontier/trunk/Common/source/langverbs.c 2006-04-05 23:08:41 UTC (rev 1205) +++ Frontier/trunk/Common/source/langverbs.c 2006-04-05 23:21:19 UTC (rev 1206) @@ -1855,13 +1855,16 @@ } return (true); // continue traversal - } /*releasesemaphorevisit*/ +} /*releasesemaphorevisit*/ -boolean langreleasesemaphores (hdlprocessrecord xxxhp) { - +boolean +langreleasesemaphores (hdlprocessrecord xxxhp) +{ +#pragma unused(xxxhp) + pushhashtable (semaphoretable); // for visit's hashdelete - + hashtablevisit (semaphoretable, &releasesemaphorevisit, (ptrvoid) (**getcurrentthreadglobals()).idthread); pophashtable (); @@ -1932,49 +1935,50 @@ default: return (false); } - } - + } + setbooleanvalue (false, v); /*by default, lang functions return false*/ - - switch (token) { - - case killscriptfunc: { + + switch (token) + { + case killscriptfunc: + { tyvaluerecord val; - boolean fl; - + boolean lfl; + flnextparamislast = true; - + if (!getparamvalue (hparam1, 1, &val)) return (false); - - if (val.valuetype == longvaluetype) { - + + if (val.valuetype == longvaluetype) + { langgetmiscstring (unknownstring, bs); - + setoserrorparam (bs); - - fl = oserror (val.data.longvalue); - } - else { - + + lfl = oserror (val.data.longvalue); + } + else + { if (!coercetostring (&val)) return (false); - + pullstringvalue (&val, bs); - - fl = langerrormessage (bs); - } - + + lfl = langerrormessage (bs); + } + /* if (!getstringvalue (hparam1, 1, bs)) return (false); */ - - (*v).data.flvalue = fl; - + + (*v).data.flvalue = lfl; + return (false); - } - + } + case newfunc: return (newvaluefunc (hparam1, v)); @@ -3745,7 +3749,7 @@ #if defined(MACVERSION) && __POWERPC__ long stream = nil; - bigstring bs; + bigstring lbs; if (langgetparamcount (hparam1) > 0) { @@ -3755,10 +3759,10 @@ return (false); } - if (!fwsNetEventGetStats (stream, bs)) + if (!fwsNetEventGetStats (stream, lbs)) return (false); - return (setstringvalue (bs, v)); + return (setstringvalue (lbs, v)); #else langerror (unimplementedverberror); Modified: Frontier/trunk/Common/source/miniwindow.c =================================================================== --- Frontier/trunk/Common/source/miniwindow.c 2006-04-05 23:08:41 UTC (rev 1205) +++ Frontier/trunk/Common/source/miniwindow.c 2006-04-05 23:21:19 UTC (rev 1206) @@ -421,7 +421,8 @@ static boolean minimessage (bigstring bs, boolean flbackgroundmsg) { - +#pragma unused (flbackgroundmsg) + copystring (bs, (**minidata).bsmsg); return (minidrawmsg ()); Modified: Frontier/trunk/Common/source/mouse.c =================================================================== --- Frontier/trunk/Common/source/mouse.c 2006-04-05 23:08:41 UTC (rev 1205) +++ Frontier/trunk/Common/source/mouse.c 2006-04-05 23:21:19 UTC (rev 1206) @@ -369,6 +369,9 @@ static short translatemouseeventtype (long eventwhat) { +#ifdef MACVERSION +# pragma unused (eventwhat) +#endif #ifdef WIN95VERSION switch (eventwhat) { Modified: Frontier/trunk/Common/source/odbengine.c =================================================================== --- Frontier/trunk/Common/source/odbengine.c 2006-04-05 23:08:41 UTC (rev 1205) +++ Frontier/trunk/Common/source/odbengine.c 2006-04-05 23:21:19 UTC (rev 1206) @@ -231,7 +231,8 @@ static boolean odberrorroutine (bigstring bs, ptrvoid refcon) { - +#pragma unused (refcon) + copystring (bs, bserror); return (false); /*consume the error*/ Modified: Frontier/trunk/Common/source/opedit.c =================================================================== --- Frontier/trunk/Common/source/opedit.c 2006-04-05 23:08:41 UTC (rev 1205) +++ Frontier/trunk/Common/source/opedit.c 2006-04-05 23:21:19 UTC (rev 1206) @@ -119,7 +119,8 @@ boolean opdefaultgetwpedittext (hdlheadrecord hnode, boolean flunload) { - +#pragma unused (flunload) + /* 2/7/97 dmb: we are called with the wp globals set up. our job it to extract the current text from the wp. @@ -305,7 +306,8 @@ static pascal void opedittrackclick (hdlwprecord wp, Point pt) { - +#pragma unused(wp) + /* 5.0a3 dmb: check outlinerect, now windowinfo's contentrect (via shellcheckautoscroll) */ Modified: Frontier/trunk/Common/source/opstructure.c =================================================================== --- Frontier/trunk/Common/source/opstructure.c 2006-04-05 23:08:41 UTC (rev 1205) +++ Frontier/trunk/Common/source/opstructure.c 2006-04-05 23:21:19 UTC (rev 1206) @@ -1972,7 +1972,8 @@ static boolean opclearmarkvisit (hdlheadrecord hnode, ptrvoid refcon) { - +#pragma unused (refcon) + register hdlheadrecord h = hnode; if ((**h).flmarked) { @@ -2068,7 +2069,8 @@ static boolean opsetbarcursorvisit (hdlheadrecord hnode, ptrvoid refcon) { - +#pragma unused (refcon) + (**outlinedata).hbarcursor = hnode; /*move barcursor here*/ return (false); /*this is the only marked node*/ @@ -2116,7 +2118,8 @@ static boolean opcopymarkedvisit (hdlheadrecord hnode, ptrvoid refcon) { - +#pragma unused (refcon) + /* 10/3/92 dmb: set levels so that all copies are summits */ @@ -2153,11 +2156,17 @@ } /*opcopymarkedvisit*/ -static boolean optrytextcommand (boolean (*editroutine) (void), boolean flneedselection, boolean flchanging) { +static boolean +optrytextcommand ( + boolean (*editroutine) (void), + boolean flneedselection, + boolean flchanging) +{ +#pragma unused (flchanging) register hdloutlinerecord ho = outlinedata; long startsel, endsel; - + if (!(**ho).fltextmode) return (false); @@ -2383,7 +2392,8 @@ static boolean opdeletenodevisit (hdlheadrecord hnode, ptrvoid refcon) { - +#pragma unused (refcon) + return (opdeletenode (hnode)); } /*opdeletenodevisit*/ Modified: Frontier/trunk/Common/source/opverbs.c =================================================================== --- Frontier/trunk/Common/source/opverbs.c 2006-04-05 23:08:41 UTC (rev 1205) +++ Frontier/trunk/Common/source/opverbs.c 2006-04-05 23:21:19 UTC (rev 1206) @@ -2025,7 +2025,8 @@ static boolean opgetsourceverb (hdltreenode hparam1, boolean flosacode, tyvaluerecord *v) { - +#pragma unused(flosacode) + register hdltreenode hp1 = hparam1; hdlhashtable htable; bigstring bsname; @@ -2109,6 +2110,8 @@ static boolean convertprofiletoticksvisit (hdlhashnode hnode, ptrvoid refcon) { +#pragma unused (refcon) + tyvaluerecord * val = &(**hnode).val; (*val).data.longvalue = ( ( (*val).data.longvalue * 3 ) / 50 ); @@ -2483,6 +2486,7 @@ boolean opsetexpansionstateverb (tyvaluerecord *vlist, tyvaluerecord *v) { +#pragma unused(v) /* 6.2a6 AR: Takes the output of op.getExpansionState and sets the outline state accordingly. @@ -2862,7 +2866,8 @@ static boolean opvisitallverb (hdltreenode hparam1, tyvaluerecord *v, bigstring bserror) { - +#pragma unused (bserror) + /* 7.0b17 PBS: visit every headline, running the specified callback script. */ @@ -3858,11 +3863,11 @@ //if (!langexternalgetexternalparam (hparam1, 1, &id, (hdlexternalvariable *) &hv) || (id != idoutlineprocessor)) { if (!floutline) { - bigstring bserror; + bigstring lbserror; - getstringlist (operrorlist, namenotoutlineerror, bserror); + getstringlist (operrorlist, namenotoutlineerror, lbserror); - langerrormessage (bserror); + langerrormessage (lbserror); return (false); } @@ -3906,11 +3911,11 @@ else { - register hdloutlinerecord ho = outlinedata; + register hdloutlinerecord lho = outlinedata; - (**ho).fldirty = false; /*the outline structure is not dirty*/ + (**lho).fldirty = false; /*the outline structure is not dirty*/ - (**ho).flrecentlychanged = false; /*in case someone is maintaining a parallel structure*/ + (**lho).flrecentlychanged = false; /*in case someone is maintaining a parallel structure*/ } /*else*/ fl = true; @@ -3939,15 +3944,15 @@ case getselectedsuboutlinesfunc: { /*7.0b18 PBS: get selected headlines as an outline*/ - hdloutlinerecord ho; + hdloutlinerecord lho; flnextparamislast = true; /*Get outline parameter.*/ - if (getoutlinevalue (hparam1, 1, &ho)) /*First param is an outline to add to*/ + if (getoutlinevalue (hparam1, 1, &lho)) /*First param is an outline to add to*/ - fl = opgetselectedsuboutlinesverb (ho); + fl = opgetselectedsuboutlinesverb (lho); setbooleanvalue (fl, vreturned); @@ -3956,17 +3961,17 @@ case sethtmlformattingfunc: { /*7.0b28: turn on and off HTML formatting.*/ - boolean fl = false; + boolean lfl = false; boolean flchanged = false; flnextparamislast = true; - if (!getbooleanvalue (hparam1, 1, &fl)) + if (!getbooleanvalue (hparam1, 1, &lfl)) break; if ((**outlinedata).outlinetype == outlineisoutline) { /*outlines only*/ - if ((**outlinedata).flhtml != fl) { /*Don't bother if it's already set as requested.*/ + if ((**outlinedata).flhtml != lfl) { /*Don't bother if it's already set as requested.*/ long startsel, endsel; @@ -3979,7 +3984,7 @@ opunloadeditbuffer (); } - (**outlinedata).flhtml = fl; + (**outlinedata).flhtml = lfl; opdirtyview (); @@ -3998,7 +4003,7 @@ } /*if*/ } /*if*/ - fl = setbooleanvalue (flchanged, vreturned); + lfl = setbooleanvalue (flchanged, vreturned); break; } @@ -4197,7 +4202,8 @@ boolean opverbfind (hdlexternalvariable hvariable, boolean *flzoom) { - +#pragma unused(flzoom) + register hdloutlinevariable hv = (hdloutlinevariable) hvariable; register hdloutlinerecord ho; register boolean fl; Modified: Frontier/trunk/Common/source/tabledisplay.c =================================================================== --- Frontier/trunk/Common/source/tabledisplay.c 2006-04-05 23:08:41 UTC (rev 1205) +++ Frontier/trunk/Common/source/tabledisplay.c 2006-04-05 23:21:19 UTC (rev 1206) @@ -419,7 +419,8 @@ static Rect titlerect; static void tableinverttitle (boolean flinrectnow) { - +#pragma unused (flinrectnow) + invertrect (titlerect); } /*tableinverttitle*/ @@ -458,9 +459,9 @@ if (trackicon (titlerect, &tableinverttitle)) { hdlhashtable ht; - bigstring bs; + bigstring lbs; - tablegetcursorinfo (&ht, bs, nil, nil); + tablegetcursorinfo (&ht, lbs, nil, nil); tablesetsortorder (ht, col); } @@ -844,7 +845,8 @@ static boolean tablegetmaxwidthvisit (hdlheadrecord hnode, ptrvoid refcon) { - +#pragma unused (refcon) + short col; if ((**hnode).flexpanded) { Modified: Frontier/trunk/Common/source/wpverbs.c =================================================================== --- Frontier/trunk/Common/source/wpverbs.c 2006-04-05 23:08:41 UTC (rev 1205) +++ Frontier/trunk/Common/source/wpverbs.c 2006-04-05 23:21:19 UTC (rev 1206) @@ -222,7 +222,8 @@ boolean wpverbgettypestring (hdlexternalvariable hvariable, bigstring bs) { - +#pragma unused (hvariable) + getstringlist (wpstringlist, wptypestring, bs); return (true); @@ -243,7 +244,7 @@ static boolean wpdisposevariable (hdlexternalvariable hvariable, boolean fldisk) { - +#pragma unused (fldisk) register hdlwpvariable hv = (hdlwpvariable) hvariable; register long vdata = (**hv).variabledata; @@ -1809,7 +1810,8 @@ boolean wpverbfind (hdlexternalvariable hvariable, boolean *flzoom) { - +#pragma unused(flzoom) + register hdlwpvariable hv = (hdlwpvariable) hvariable; register hdlwprecord hwp; register boolean fl; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
