|
From: <kar...@us...> - 2006-04-05 22:20:09
|
Revision: 1200 Author: karstenw Date: 2006-04-05 15:19:55 -0700 (Wed, 05 Apr 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1200&view=rev Log Message: ----------- parameter unused & name conflict fixes Modified Paths: -------------- Frontier/trunk/Common/source/claycallbacks.c Frontier/trunk/Common/source/dbverbs.c Frontier/trunk/Common/source/menubar.c Frontier/trunk/Common/source/shellbuttons.c Modified: Frontier/trunk/Common/source/claycallbacks.c =================================================================== --- Frontier/trunk/Common/source/claycallbacks.c 2006-04-05 22:17:27 UTC (rev 1199) +++ Frontier/trunk/Common/source/claycallbacks.c 2006-04-05 22:19:55 UTC (rev 1200) @@ -594,7 +594,8 @@ static boolean clayfolderloopvisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, ptrvoid refcon) { - +#pragma unused(hnode, val) + /* 5.0a3 dmb: set flmayaffectdisplay for the parent table @@ -618,7 +619,8 @@ boolean clayfolderloop (const tybrowserspec *pfs, boolean flreverse, tyclayfileloopcallback filecallback, long refcon) { - +#pragma unused(flreverse) + /* 5.0.2b21 dmb: set hdatafield according to pfs; no more databasedata refs */ Modified: Frontier/trunk/Common/source/dbverbs.c =================================================================== --- Frontier/trunk/Common/source/dbverbs.c 2006-04-05 22:17:27 UTC (rev 1199) +++ Frontier/trunk/Common/source/dbverbs.c 2006-04-05 22:19:55 UTC (rev 1200) @@ -524,6 +524,7 @@ boolean dbcloseallfiles (long refcon) { +#pragma unused (refcon) return (true); } /*dbcloseallfiles*/ @@ -930,7 +931,8 @@ static boolean dbfunctionvalue (short token, hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) { - +#pragma unused (bserror) + /* 4.1b4 dmb: new verb set based on odbEngine Modified: Frontier/trunk/Common/source/menubar.c =================================================================== --- Frontier/trunk/Common/source/menubar.c 2006-04-05 22:17:27 UTC (rev 1199) +++ Frontier/trunk/Common/source/menubar.c 2006-04-05 22:19:55 UTC (rev 1200) @@ -504,7 +504,7 @@ // continue; if (item.idmenu != -1) - + { if (flactivate) { if (item.flhierarchic) @@ -513,7 +513,8 @@ else meremovemenu (&item); } - + } + (**hs).flactive = flactivate; medirtymenubar (); @@ -1951,7 +1952,8 @@ static unsigned char menullchar (hdlheadrecord hn) { - +#pragma unused (hn) + return (chnul); } /*menullchar*/ Modified: Frontier/trunk/Common/source/shellbuttons.c =================================================================== --- Frontier/trunk/Common/source/shellbuttons.c 2006-04-05 22:17:27 UTC (rev 1199) +++ Frontier/trunk/Common/source/shellbuttons.c 2006-04-05 22:19:55 UTC (rev 1200) @@ -372,8 +372,16 @@ } tybuttoninfo, *ptrbuttoninfo, **hdlbuttoninfo; - static void MyThemeButtonDrawCallback (const Rect *bounds, ThemeButtonKind kind, const ThemeButtonDrawInfo *info, - UInt32 userData, SInt16 depth, Boolean isColorDev) { +static void +MyThemeButtonDrawCallback ( + const Rect *bounds, + ThemeButtonKind kind, + const ThemeButtonDrawInfo *info, + UInt32 userData, + SInt16 depth, + Boolean isColorDev) +{ +#pragma unused (kind, info, depth, isColorDev) /* 7.0b48 PBS: draw the label for a popup menu. @@ -416,9 +424,9 @@ tybuttoninfo buttoninfo; boolean flenabled = buttonenabled (ix); Handle h; - + copystring (bs, buttoninfo.bslabel); - + buttoninfo.flenabled = flenabled; drawupp = NewThemeButtonDrawUPP (MyThemeButtonDrawCallback); @@ -723,6 +731,7 @@ void shellbuttonadjustcursor (Point pt) { +#pragma unused (pt) setcursortype (cursorisarrow); /*no special button cursor, 4/23/90*/ } /*shellbuttonadjustcursor*/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |