Menu
▾
▴
SF.net SVN: frontierkernel: [1202] Frontier/trunk/Common/source
|
From: <kar...@us...> - 2006-04-05 22:52:20
|
Revision: 1202 Author: karstenw Date: 2006-04-05 15:52:08 -0700 (Wed, 05 Apr 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1202&view=rev Log Message: ----------- parameter unused & name conflict fixes Modified Paths: -------------- Frontier/trunk/Common/source/dialogs.c Frontier/trunk/Common/source/icon.c Frontier/trunk/Common/source/langhash.c Frontier/trunk/Common/source/shellwindow.c Frontier/trunk/Common/source/tableformats.c Modified: Frontier/trunk/Common/source/dialogs.c =================================================================== --- Frontier/trunk/Common/source/dialogs.c 2006-04-05 22:31:38 UTC (rev 1201) +++ Frontier/trunk/Common/source/dialogs.c 2006-04-05 22:52:08 UTC (rev 1202) @@ -896,7 +896,8 @@ static void passwordprocesskey (DialogPtr pdialog, char chkb, EventRecord *ev, short *item) { - +#pragma unused (item) + TEHandle hte; char *buffer; short start, end; @@ -1083,10 +1084,10 @@ //at some points to use ModalDialog Correctly. #if TARGET_API_MAC_CARBON == 1 { - WindowRef pWindow = GetDialogWindow(pdialog); + WindowRef lpWindow = GetDialogWindow(pdialog); CGrafPtr thePort = GetDialogPort(pdialog); - SelectWindow(pWindow); + SelectWindow(lpWindow); QDFlushPortBuffer(thePort, nil); } #else Modified: Frontier/trunk/Common/source/icon.c =================================================================== --- Frontier/trunk/Common/source/icon.c 2006-04-05 22:31:38 UTC (rev 1201) +++ Frontier/trunk/Common/source/icon.c 2006-04-05 22:52:08 UTC (rev 1202) @@ -668,9 +668,17 @@ #if TARGET_API_MAC_CARBON == 1 - static void MyThemeButtonDrawCallback (const Rect *bounds, ThemeButtonKind kind, const ThemeButtonDrawInfo *info, - UInt32 refcon, SInt16 depth, Boolean isColorDev) { - +static void +MyThemeButtonDrawCallback ( + const Rect *bounds, + ThemeButtonKind kind, + const ThemeButtonDrawInfo *info, + UInt32 refcon, + SInt16 depth, + Boolean isColorDev) +{ +#pragma unused (kind, info, refcon, depth, isColorDev) + /* 7.0b48 PBS: draw the arrow for a pushbutton. It will be centered. */ @@ -684,9 +692,10 @@ rarrow.left++; /*it appears to need it*/ - DrawThemePopupArrow (&rarrow, kThemeArrowRight, kThemeArrow9pt, kThemeStateActive, NULL, (UInt32) NULL); - } /*MyThemeButtonDrawCallback*/ + DrawThemePopupArrow (&rarrow, kThemeArrowRight, kThemeArrow9pt, kThemeStateActive, NULL, 0); + } /*MyThemeButtonDrawCallback*/ + #endif void drawlabeledwindoidicon (Rect r, bigstring bslabel, boolean flhastext, boolean flpressed) { Modified: Frontier/trunk/Common/source/langhash.c =================================================================== --- Frontier/trunk/Common/source/langhash.c 2006-04-05 22:31:38 UTC (rev 1201) +++ Frontier/trunk/Common/source/langhash.c 2006-04-05 22:52:08 UTC (rev 1202) @@ -2533,7 +2533,7 @@ 6.2a15 AR: added flmustsave parameter */ - typackinforecord *pi = (typackinforecord *) refcon; + typackinforecord *lpi = (typackinforecord *) refcon; tydisksymbolrecord rec; bigstring bsvalue; long size; @@ -2559,7 +2559,7 @@ clearbytes (&rec, sizeof (rec)); - if (!hashpackstring (&pi->s2, bsname, &rec.ixkey)) + if (!hashpackstring (&lpi->s2, bsname, &rec.ixkey)) goto error; memtodisklong (rec.ixkey); @@ -2576,7 +2576,7 @@ case oldstringvaluetype: copyheapstring ((hdlstring) val.data.stringvalue, bsvalue); - if (!hashpackstring (&pi->s2, bsvalue, &rec.data.longvalue)) + if (!hashpackstring (&lpi->s2, bsvalue, &rec.data.longvalue)) goto error; break; @@ -2591,7 +2591,7 @@ if (!fl) // on error, bsvalue should at least be item's name; don't break the save ; - if (!hashpackstring (&pi->s2, bsvalue, &rec.data.longvalue)) + if (!hashpackstring (&lpi->s2, bsvalue, &rec.data.longvalue)) goto error; break; @@ -2614,7 +2614,7 @@ enablelangerror (); - if (!hashpackbinary (&pi->s2, (Handle) x, &rec.data.longvalue)) + if (!hashpackbinary (&lpi->s2, (Handle) x, &rec.data.longvalue)) goto error; disposehandle ((Handle) halias); /*3.0.2*/ @@ -2628,7 +2628,7 @@ recttodiskrect (*val.data.rectvalue, &rdisk); - if (!hashpackdata (&pi->s2, &rdisk, sizeof (rdisk), &rec.data.longvalue)) + if (!hashpackdata (&lpi->s2, &rdisk, sizeof (rdisk), &rec.data.longvalue)) goto error; break; @@ -2639,7 +2639,7 @@ rgbtodiskrgb (*val.data.rgbvalue, &rgbdisk); - if (!hashpackdata (&pi->s2, &rgbdisk, sizeof (rgbdisk), &rec.data.longvalue)) + if (!hashpackdata (&lpi->s2, &rgbdisk, sizeof (rgbdisk), &rec.data.longvalue)) goto error; break; @@ -2657,7 +2657,7 @@ dtox80 (&x, &x80); #endif - if (!hashpackdata (&pi->s2, &x80, sizeof (x80), &rec.data.longvalue)) + if (!hashpackdata (&lpi->s2, &x80, sizeof (x80), &rec.data.longvalue)) goto error; break; @@ -2681,7 +2681,7 @@ case listvaluetype: case recordvaluetype: #endif - if (!hashpackscalar (&pi->s2, hnode, &rec.data.longvalue)) + if (!hashpackscalar (&lpi->s2, hnode, &rec.data.longvalue)) goto error; break; @@ -2692,7 +2692,7 @@ if (!oppacklist (val.data.listvalue, &hpacked)) goto error; - if (!hashpackbinary (&pi->s2, hpacked, &rec.data.longvalue)) + if (!hashpackbinary (&lpi->s2, hpacked, &rec.data.longvalue)) goto error; rec.version = 2; @@ -2708,7 +2708,7 @@ if (!langpackfileval (&val, &hpacked)) goto error; - if (!hashpackbinary (&pi->s2, hpacked, &rec.data.longvalue)) + if (!hashpackbinary (&lpi->s2, hpacked, &rec.data.longvalue)) goto error; rec.version = 2; @@ -2722,7 +2722,7 @@ if (!langpacktree (val.data.codevalue, &hpacked)) goto error; - if (!hashpackbinary (&pi->s2, hpacked, &rec.data.longvalue)) + if (!hashpackbinary (&lpi->s2, hpacked, &rec.data.longvalue)) goto error; disposehandle (hpacked); /*3.0.2*/ @@ -2732,10 +2732,10 @@ case externalvaluetype: { boolean flnewdbaddress = false; - if (!hashpackexternal (&pi->s2, (hdlexternalvariable) val.data.externalvalue, &rec.data.longvalue, &flnewdbaddress)) + if (!hashpackexternal (&lpi->s2, (hdlexternalvariable) val.data.externalvalue, &rec.data.longvalue, &flnewdbaddress)) goto error; - pi->flmustsave = pi->flmustsave || flnewdbaddress; + lpi->flmustsave = lpi->flmustsave || flnewdbaddress; break; } @@ -2792,7 +2792,7 @@ if (size == sizeof (short)) memtodiskshort (rec.data.intvalue); - if (!writehandlestream (&pi->s1, &rec, sizeof (rec))) + if (!writehandlestream (&lpi->s1, &rec, sizeof (rec))) goto error; languntraperrors (savecallback, saverefcon, false); @@ -2801,9 +2801,9 @@ error: - disposehandlestream (&pi->s1); + disposehandlestream (&lpi->s1); - disposehandlestream (&pi->s2); + disposehandlestream (&lpi->s2); languntraperrors (savecallback, saverefcon, true); @@ -3519,12 +3519,12 @@ } /*hashgetnthnode*/ -boolean hashgetsortedindex (hdlhashtable htable, hdlhashnode hnode, long *index) { +boolean hashgetsortedindex (hdlhashtable htable, hdlhashnode hnode, long *idx) { /* traverse the sorted list for the indicated table, looking for the indicated node. - if we find it, set *index to its index, and return true. + if we find it, set *idx to its index, and return true. the index is 0-based. */ @@ -3536,7 +3536,7 @@ if (nomad == hnode) { /*found it*/ - *index = ct; + *idx = ct; return (true); } Modified: Frontier/trunk/Common/source/shellwindow.c =================================================================== --- Frontier/trunk/Common/source/shellwindow.c 2006-04-05 22:31:38 UTC (rev 1201) +++ Frontier/trunk/Common/source/shellwindow.c 2006-04-05 22:52:08 UTC (rev 1202) @@ -121,15 +121,15 @@ void shelldrawgrowicon (hdlwindowinfo hinfo) { - - #ifdef MACVERSION - #if TARGET_API_MAC_CARBON == 1 - - return; +# ifdef MACVERSION +# if TARGET_API_MAC_CARBON == 1 +# pragma unused (hinfo) + + return; + +# else - #else - Rect r; if (shellgetgrowiconrect (hinfo, &r)) { @@ -1218,7 +1218,8 @@ static boolean counttypedvisit (WindowPtr w, ptrvoid refcon) { - +#pragma unused(w) + (*(short *)refcon)++; return (true); @@ -1451,7 +1452,8 @@ static boolean graywindowvisit (WindowPtr w, ptrvoid refcon) { - +#pragma unused (refcon) + graywindow (w); return (true); @@ -2346,7 +2348,8 @@ boolean shellzoomwindow (hdlwindowinfo hinfo, boolean flzoomin) { - +#pragma unused (flzoomin) + /* 9/16/91 dmb: use the new getcontentsizeroutine to apply intelligent window sizing when zooming window. @@ -2988,7 +2991,7 @@ if ((**h).flneversaved) deletefile (&fspec); - flushvolumechanges (&fspec, (short) NULL); + flushvolumechanges (&fspec, (hdlfilenum)0); } (**h).fnum = 0; /*indicate no file open*/ Modified: Frontier/trunk/Common/source/tableformats.c =================================================================== --- Frontier/trunk/Common/source/tableformats.c 2006-04-05 22:31:38 UTC (rev 1201) +++ Frontier/trunk/Common/source/tableformats.c 2006-04-05 22:52:08 UTC (rev 1202) @@ -774,29 +774,30 @@ boolean tablenewformatsrecord (hdlhashtable ht, Rect tablerect, hdltableformats *hformats) { - +#pragma unused(tablerect) + /* allocate a new tableformats and set default and/or initial values of fields of the record. */ register hdltableformats hf = nil; - tyconfigrecord config; + tyconfigrecord lconfig; if (!newtableformats (hformats)) return (false); hf = *hformats; /*copy into register*/ - langexternalgetconfig (tablevaluetype, idtableconfig, &config); + langexternalgetconfig (tablevaluetype, idtableconfig, &lconfig); - (**hf).windowrect = config.defaultwindowrect; + (**hf).windowrect = lconfig.defaultwindowrect; - (**hf).fontnum = config.defaultfont; + (**hf).fontnum = lconfig.defaultfont; - (**hf).fontsize = config.defaultsize; + (**hf).fontsize = lconfig.defaultsize; - (**hf).fontstyle = config.defaultstyle; + (**hf).fontstyle = lconfig.defaultstyle; tableformatsdata = hf; /*set global for displayinfo routine*/ @@ -828,7 +829,8 @@ static boolean notexpandedvisit (hdlheadrecord hnode, ptrvoid refcon) { - +#pragma unused (refcon) + return (!opsubheadsexpanded (hnode)); } /*notexpandedvisit*/ @@ -1067,10 +1069,10 @@ //load table outline if (info.savedoutline) { + + tyconfigrecord lconfig; - tyconfigrecord config; - - langexternalgetconfig (tablevaluetype, idtableconfig, &config); // force loading of prefs + langexternalgetconfig (tablevaluetype, idtableconfig, &lconfig); // force loading of prefs fl = opunpack (hpacked, &ixhandle, &ho); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
