Menu
▾
▴
[frontierkernel-commits] Frontier/Common/source about.c,1.6,1.6.8.1 bitmaps.c,1.3,1.3.6.1 dialogs.c,1.7,1.7.2.1 fileloop.c,1.5,1.5.4.1 frontierdebug.c,1.4,1.4.6.1 langipc.c,1.6,1.6.6.1 langops.c,1.4.6.1,1.4.6.2 langquicktime.c,1.3,1.3.6.1 langsystypes.c,1.6,1.6.2.1 langvalue.c,1.8.2.1,1.8.2.2 langverbs.c,1.12.2.1,1.12.2.2 memory.c,1.6,1.6.4.1 pictverbs.c,1.4.6.1,1.4.6.2 scripts.c,1.4,1.4.6.1 services.c,1.4,1.4.6.1 wpengine.c,1.9,1.9.2.1
|
From: Karsten W. <kar...@us...> - 2006-02-02 18:40:12
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7622 Modified Files: Tag: pre_int64_branch about.c bitmaps.c dialogs.c fileloop.c frontierdebug.c langipc.c langops.c langquicktime.c langsystypes.c langvalue.c langverbs.c memory.c pictverbs.c scripts.c services.c wpengine.c Log Message: second round (minor) changes for i64 Index: langverbs.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langverbs.c,v retrieving revision 1.12.2.1 retrieving revision 1.12.2.2 diff -C2 -d -r1.12.2.1 -r1.12.2.2 *** langverbs.c 31 Jan 2006 16:43:31 -0000 1.12.2.1 --- langverbs.c 2 Feb 2006 18:39:59 -0000 1.12.2.2 *************** *** 865,868 **** --- 865,869 ---- if ((type >= outlinevaluetype) && (type <= pictvaluetype)) { #if LONGINT_LONGDATE == 1 + // kw - 2006-01-30 debugging aids int x = type; if ((type == 38) || (type == 39)) *************** *** 4168,4173 **** return (loadfunctionprocessor (idlangverbs, &langfunctionvalue)); } /*langinitbuiltins*/ - - - - --- 4169,4170 ---- Index: wpengine.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/wpengine.c,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -C2 -d -r1.9 -r1.9.2.1 *** wpengine.c 5 Dec 2005 20:36:16 -0000 1.9 --- wpengine.c 2 Feb 2006 18:39:59 -0000 1.9.2.1 *************** *** 510,532 **** //Must pass a CGrafPtr to pushport on OS X to avoid a crash ! #ifdef MACVERSION ! CGrafPtr thePort; ! #if TARGET_API_MAC_CARBON == 1 ! thePort = GetWindowPort(wpwindow); ! #else ! thePort = (CGrafPtr)wpwindow; ! #endif ! pushport (thePort); ! #endif ! #ifdef WIN95VERSION ! pushport (wpwindow); ! #endif --- 510,532 ---- //Must pass a CGrafPtr to pushport on OS X to avoid a crash ! #ifdef MACVERSION ! CGrafPtr thePort; ! #if TARGET_API_MAC_CARBON == 1 ! thePort = GetWindowPort(wpwindow); ! #else ! thePort = (CGrafPtr)wpwindow; ! #endif ! pushport (thePort); ! #endif ! #ifdef WIN95VERSION ! pushport (wpwindow); ! #endif *************** *** 1960,1963 **** --- 1960,1964 ---- /* kw - 2005-12-05 remove this after print error correction */ #if TARGET_API_MAC_CARBON == 1 + #pragma unused(pagenumber) return (false); #else Index: frontierdebug.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/frontierdebug.c,v retrieving revision 1.4 retrieving revision 1.4.6.1 diff -C2 -d -r1.4 -r1.4.6.1 *** frontierdebug.c 11 Jan 2005 22:48:05 -0000 1.4 --- frontierdebug.c 2 Feb 2006 18:39:59 -0000 1.4.6.1 *************** *** 209,213 **** static void logtodialog (char *str) { ! }/*logtodialog*/ --- 209,213 ---- static void logtodialog (char *str) { ! #pragma unused(str) }/*logtodialog*/ Index: pictverbs.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/pictverbs.c,v retrieving revision 1.4.6.1 retrieving revision 1.4.6.2 diff -C2 -d -r1.4.6.1 -r1.4.6.2 *** pictverbs.c 31 Jan 2006 16:43:31 -0000 1.4.6.1 --- pictverbs.c 2 Feb 2006 18:39:59 -0000 1.4.6.2 *************** *** 108,112 **** boolean pictverbgettypestring (hdlexternalvariable hvariable, bigstring bs) { ! getstringlist (pictstringlist, picttypestring, bs); --- 108,112 ---- boolean pictverbgettypestring (hdlexternalvariable hvariable, bigstring bs) { ! #pragma unused(hvariable) getstringlist (pictstringlist, picttypestring, bs); *************** *** 116,120 **** static boolean pictdisposevariable (hdlexternalvariable hvariable, boolean fldisk) { ! return (pictdisposerecord ((hdlpictrecord) (**hvariable).variabledata)); } /*pictdisposevariable*/ --- 116,120 ---- static boolean pictdisposevariable (hdlexternalvariable hvariable, boolean fldisk) { ! #pragma unused(fldisk) return (pictdisposerecord ((hdlpictrecord) (**hvariable).variabledata)); } /*pictdisposevariable*/ *************** *** 435,439 **** boolean pictverbpacktotext (hdlexternalvariable h, Handle htext) { ! bigstring bs; --- 435,439 ---- boolean pictverbpacktotext (hdlexternalvariable h, Handle htext) { ! #pragma unused(h) bigstring bs; *************** *** 1022,1026 **** boolean pictverbfind (hdlexternalvariable hvariable, boolean *flzoom) { ! return (false); } /*pictverbfind*/ --- 1022,1026 ---- boolean pictverbfind (hdlexternalvariable hvariable, boolean *flzoom) { ! #pragma unused(hvariable, flzoom) return (false); } /*pictverbfind*/ *************** *** 1068,1072 **** static boolean pictprint (short pagenumber) { ! register hdlpictrecord hp = pictdata; register PicHandle macpicture = (**hp).macpicture; --- 1068,1072 ---- static boolean pictprint (short pagenumber) { ! #pragma unused(pagenumber) register hdlpictrecord hp = pictdata; register PicHandle macpicture = (**hp).macpicture; Index: langquicktime.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langquicktime.c,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** langquicktime.c 11 Jan 2005 22:48:07 -0000 1.3 --- langquicktime.c 2 Feb 2006 18:39:59 -0000 1.3.6.1 *************** *** 84,88 **** static boolean quicktimeopenverb (hdltreenode hp1, tyvaluerecord *v) { ! /* 7.0b4 PBS: Open a movie in the QuickTime player window. --- 84,88 ---- static boolean quicktimeopenverb (hdltreenode hp1, tyvaluerecord *v) { ! #pragma unused (v) /* 7.0b4 PBS: Open a movie in the QuickTime player window. Index: scripts.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/scripts.c,v retrieving revision 1.4 retrieving revision 1.4.6.1 diff -C2 -d -r1.4 -r1.4.6.1 *** scripts.c 11 Jan 2005 22:48:10 -0000 1.4 --- scripts.c 2 Feb 2006 18:39:59 -0000 1.4.6.1 *************** *** 524,528 **** static boolean installscriptvisit (hdlhashnode hnode, ptrvoid refcon) { ! hdltreenode hcode; --- 524,528 ---- static boolean installscriptvisit (hdlhashnode hnode, ptrvoid refcon) { ! #pragma unused(refcon) hdltreenode hcode; *************** *** 582,586 **** static boolean newprocessvisit (hdlhashnode hnode, ptrvoid refcon) { ! hdltreenode hcode; hdlprocessrecord hprocess; --- 582,586 ---- static boolean newprocessvisit (hdlhashnode hnode, ptrvoid refcon) { ! #pragma unused(refcon) hdltreenode hcode; hdlprocessrecord hprocess; *************** *** 701,705 **** static boolean runprocessvisit (hdlhashnode hnode, ptrvoid refcon) { ! hdltreenode hcode; hdlprocessrecord hprocess; --- 701,705 ---- static boolean runprocessvisit (hdlhashnode hnode, ptrvoid refcon) { ! #pragma unused(refcon) hdltreenode hcode; hdlprocessrecord hprocess; *************** *** 770,774 **** static boolean scriptinvalbuttonsvisit (WindowPtr w, ptrvoid refcon) { ! /* 7.0b42 PBS: If Mac OS X, re-draw the script buttons right away, because --- 770,774 ---- static boolean scriptinvalbuttonsvisit (WindowPtr w, ptrvoid refcon) { ! #pragma unused(refcon) /* 7.0b42 PBS: If Mac OS X, re-draw the script buttons right away, because *************** *** 1445,1449 **** static pascal OSErr handlerecordedtext (const AppleEvent *event, AppleEvent *reply, SInt32 refcon) { ! /* 2.1b3 dmb: ignore extra syntax/lines needed for text-based recording --- 1445,1449 ---- static pascal OSErr handlerecordedtext (const AppleEvent *event, AppleEvent *reply, SInt32 refcon) { ! #pragma unused(refcon) /* 2.1b3 dmb: ignore extra syntax/lines needed for text-based recording *************** *** 1478,1490 **** return (err); ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! ! datahandletostring (&desc, bs); ! ! #else ! ! texthandletostring (desc.dataHandle, bs); ! ! #endif stringdeletechars (bs, chnul); --- 1478,1486 ---- return (err); ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! datahandletostring (&desc, bs); ! #else ! texthandletostring (desc.dataHandle, bs); ! #endif stringdeletechars (bs, chnul); *************** *** 1533,1554 **** } else ! ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! ! { ! Handle hcopy; ! ! copydatahandle (&desc, &hcopy); ! ! floutline = isoutlinetext (hcopy); ! ! disposehandle (hcopy); ! } ! ! #else ! ! floutline = isoutlinetext (desc.dataHandle); ! ! #endif diff = indent - (**hd).lastindent; --- 1529,1545 ---- } else ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! { ! Handle hcopy; ! ! copydatahandle (&desc, &hcopy); ! ! floutline = isoutlinetext (hcopy); ! ! disposehandle (hcopy); ! } ! #else ! floutline = isoutlinetext (desc.dataHandle); ! #endif diff = indent - (**hd).lastindent; *************** *** 1685,1689 **** static pascal OSErr handlestoprecording (const AppleEvent *event, AppleEvent *reply, SInt32 refcon) { ! /* 2.1b5 dmb: special event handler for QuicKeys recording panel --- 1676,1680 ---- static pascal OSErr handlestoprecording (const AppleEvent *event, AppleEvent *reply, SInt32 refcon) { ! #pragma unused(refcon, event) /* 2.1b5 dmb: special event handler for QuicKeys recording panel Index: bitmaps.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/bitmaps.c,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** bitmaps.c 11 Jan 2005 22:48:04 -0000 1.3 --- bitmaps.c 2 Feb 2006 18:39:59 -0000 1.3.6.1 *************** *** 173,186 **** //Code change by Timothy Paustian Saturday, April 29, 2000 10:12:08 PM //Changed to Opaque call for Carbon ! #if ACCESSOR_CALLS_ARE_FUNCTIONS == 1 GetPortBounds(poffscreenworld, &portRect); CopyBits (GetPortBitMapForCopyBits(poffscreenworld), GetPortBitMapForCopyBits(psavedport), &portRect, &offscreenrect, srcCopy, nil); ! #else //old code ! #pragma unused(portRect) CopyBits (&((GrafPtr) poffscreenworld)->portBits, &((GrafPtr) psavedport)->portBits, &poffscreenworld->portRect, &offscreenrect, srcCopy, nil); ! #endif DisposeGWorld (poffscreenworld); --- 173,187 ---- //Code change by Timothy Paustian Saturday, April 29, 2000 10:12:08 PM //Changed to Opaque call for Carbon ! #if ACCESSOR_CALLS_ARE_FUNCTIONS == 1 ! #pragma unused(w) GetPortBounds(poffscreenworld, &portRect); CopyBits (GetPortBitMapForCopyBits(poffscreenworld), GetPortBitMapForCopyBits(psavedport), &portRect, &offscreenrect, srcCopy, nil); ! #else //old code ! #pragma unused(portRect) CopyBits (&((GrafPtr) poffscreenworld)->portBits, &((GrafPtr) psavedport)->portBits, &poffscreenworld->portRect, &offscreenrect, srcCopy, nil); ! #endif DisposeGWorld (poffscreenworld); *************** *** 201,205 **** static boolean openmono (Rect r, WindowPtr w) { ! register short nrowbytes; register long nboxbytes; --- 202,206 ---- static boolean openmono (Rect r, WindowPtr w) { ! #pragma unused(w) register short nrowbytes; register long nboxbytes; *************** *** 250,253 **** --- 251,255 ---- //present. These machines won't run Mac OS X anyway. #if ACCESSOR_CALLS_ARE_FUNCTIONS == 1 + #pragma unused(w) //a signal to show that this was called, it should not be assert(false); *************** *** 362,372 **** //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 //always return false for traps since this not allowed in carbon //This really is not needed but what the heck return false; ! #else return (NGetTrapAddress (trapnum, ToolTrap) != NGetTrapAddress (unimptrap, ToolTrap)); ! #endif } /*trapimplemented*/ --- 364,375 ---- //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; ! #else return (NGetTrapAddress (trapnum, ToolTrap) != NGetTrapAddress (unimptrap, ToolTrap)); ! #endif } /*trapimplemented*/ Index: services.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/services.c,v retrieving revision 1.4 retrieving revision 1.4.6.1 diff -C2 -d -r1.4 -r1.4.6.1 *** services.c 11 Jan 2005 22:48:10 -0000 1.4 --- services.c 2 Feb 2006 18:39:59 -0000 1.4.6.1 *************** *** 87,91 **** pascal OSStatus serviceshandlercopy (EventHandlerCallRef nextHandler, EventRef inEvent, void* userData) { ! /* Copy the current selection to the Services-specific scrap. --- 87,91 ---- pascal OSStatus serviceshandlercopy (EventHandlerCallRef nextHandler, EventRef inEvent, void* userData) { ! #pragma unused(nextHandler, userData) /* Copy the current selection to the Services-specific scrap. *************** *** 139,143 **** pascal OSStatus serviceshandlerpaste (EventHandlerCallRef nextHandler, EventRef inEvent, void* userData) { ! ScrapRef servicesscrap, currentscrap; long bytecount; --- 139,143 ---- pascal OSStatus serviceshandlerpaste (EventHandlerCallRef nextHandler, EventRef inEvent, void* userData) { ! #pragma unused(nextHandler, userData) ScrapRef servicesscrap, currentscrap; long bytecount; *************** *** 194,198 **** pascal OSStatus serviceshandlergettypes (EventHandlerCallRef nextHandler, EventRef inEvent, void* userData) { ! CFMutableArrayRef copytypes, pastetypes; short ix, count; --- 194,198 ---- pascal OSStatus serviceshandlergettypes (EventHandlerCallRef nextHandler, EventRef inEvent, void* userData) { ! #pragma unused(nextHandler, userData) CFMutableArrayRef copytypes, pastetypes; short ix, count; Index: about.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/about.c,v retrieving revision 1.6 retrieving revision 1.6.8.1 diff -C2 -d -r1.6 -r1.6.8.1 *** about.c 12 Jan 2005 11:34:26 -0000 1.6 --- about.c 2 Feb 2006 18:39:59 -0000 1.6.8.1 *************** *** 1297,1301 **** static boolean aboutmousedown (Point pt, tyclickflags flags) { ! /* 1/24/91 dmb: to allow the home window to be dragged with a single click, --- 1297,1301 ---- static boolean aboutmousedown (Point pt, tyclickflags flags) { ! #pragma unused(flags) /* 1/24/91 dmb: to allow the home window to be dragged with a single click, *************** *** 1774,1778 **** boolean openabout (boolean flzoom, long ctreservebytes) { ! /* 2.1b5 dmb: added ctreservebytes parameter. of non-zero, caller wants us to --- 1774,1778 ---- boolean openabout (boolean flzoom, long ctreservebytes) { ! #pragma unused(flzoom) /* 2.1b5 dmb: added ctreservebytes parameter. of non-zero, caller wants us to *************** *** 1818,1822 **** void closeabout (boolean flzoom, short minticks) { ! hdlwindowinfo hinfo; --- 1818,1822 ---- void closeabout (boolean flzoom, short minticks) { ! #pragma unused(flzoom) hdlwindowinfo hinfo; Index: langipc.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langipc.c,v retrieving revision 1.6 retrieving revision 1.6.6.1 diff -C2 -d -r1.6 -r1.6.6.1 *** langipc.c 11 Jan 2005 22:48:06 -0000 1.6 --- langipc.c 2 Feb 2006 18:39:59 -0000 1.6.6.1 *************** *** 139,143 **** boolean langipcerrorroutine (bigstring bs, ptrvoid refcon) { ! /* if an error occurs while processing a runscript verb, we want to --- 139,143 ---- boolean langipcerrorroutine (bigstring bs, ptrvoid refcon) { ! #pragma unused (refcon) /* if an error occurs while processing a runscript verb, we want to *************** *** 452,456 **** vtype = langgetvaluetype (desctype); ! #ifdef oplanglists if (vtype == listvaluetype || vtype == recordvaluetype) { /*only case that actually needs AEDesc record*/ --- 452,456 ---- vtype = langgetvaluetype (desctype); ! #ifdef oplanglists if (vtype == listvaluetype || vtype == recordvaluetype) { /*only case that actually needs AEDesc record*/ *************** *** 463,473 **** } ! #endif ! #if TARGET_API_MAC_CARBON == 1 copydatahandle (p, &hdata); /*make a copy of the opaque data handle*/ ! #else hdata = (*p).dataHandle; /*get a reference to the data handle*/ --- 463,473 ---- } ! #endif ! #if TARGET_API_MAC_CARBON == 1 copydatahandle (p, &hdata); /*make a copy of the opaque data handle*/ ! #else hdata = (*p).dataHandle; /*get a reference to the data handle*/ *************** *** 475,479 **** (*p).dataHandle = nil; /*we own the original now, make sure AE manager won't dispose*/ ! #endif AEDisposeDesc (p); --- 475,479 ---- (*p).dataHandle = nil; /*we own the original now, make sure AE manager won't dispose*/ ! #endif AEDisposeDesc (p); *************** *** 522,526 **** break; ! #if __powerc case doublevaluetype: { --- 522,526 ---- break; ! #if __powerc case doublevaluetype: { *************** *** 536,544 **** } ! #else case doublevaluetype: ! #endif case stringvaluetype: /*all of these are normal, handle-based types */ --- 536,544 ---- } ! #else case doublevaluetype: ! #endif case stringvaluetype: /*all of these are normal, handle-based types */ *************** *** 686,698 **** (*desc).descriptorType = typeNull; ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! ! newdescnull (desc, typeNull); ! ! #else ! ! (*desc).descriptorType = typeNull; ! ! #endif return (true); --- 686,694 ---- (*desc).descriptorType = typeNull; ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! newdescnull (desc, typeNull); ! #else ! (*desc).descriptorType = typeNull; ! #endif return (true); *************** *** 707,711 **** } ! #ifdef oplanglists case listvaluetype: case recordvaluetype: --- 703,707 ---- } ! #ifdef oplanglists case listvaluetype: case recordvaluetype: *************** *** 718,722 **** return (true); ! #endif default: --- 714,718 ---- return (true); ! #endif default: *************** *** 2034,2038 **** boolean langipcgetaddressvalue (hdltreenode hparam1, tyvaluerecord *vreturned) { ! return (setbooleanvalue (false, vreturned)); } /*langipcgetaddressvalue*/ --- 2030,2034 ---- boolean langipcgetaddressvalue (hdltreenode hparam1, tyvaluerecord *vreturned) { ! #pragma unused (hparam1) return (setbooleanvalue (false, vreturned)); } /*langipcgetaddressvalue*/ *************** *** 2706,2710 **** static boolean langipcgetparamvisit (bigstring bs, hdlhashnode hnode, tyvaluerecord val, ptrvoid refcon) { ! hdlverbrecord hv = (hdlverbrecord) refcon; OSType key; --- 2702,2706 ---- static boolean langipcgetparamvisit (bigstring bs, hdlhashnode hnode, tyvaluerecord val, ptrvoid refcon) { ! #pragma unused (hnode) hdlverbrecord hv = (hdlverbrecord) refcon; OSType key; *************** *** 2868,2880 **** tyvaluerecord valkey; hdlhashtable htable; ! boolean fl; flparamerrorenabled = false; /*no error dialog on getparamvalue call*/ ! fl = getparamvalue (hp1, pnum++, &valkey); flparamerrorenabled = true; /*restore*/ ! if (!fl) { /*didn't get another key*/ if (fllangerror) /*was a bad parameter; didn't run out*/ --- 2864,2876 ---- tyvaluerecord valkey; hdlhashtable htable; ! boolean lfl; // kw - 2006-02-02 - renamed due to shadow warning flparamerrorenabled = false; /*no error dialog on getparamvalue call*/ ! lfl = getparamvalue (hp1, pnum++, &valkey); flparamerrorenabled = true; /*restore*/ ! if (!lfl) { /*didn't get another key*/ if (fllangerror) /*was a bad parameter; didn't run out*/ *************** *** 2905,2909 **** flinhibitnilcoercion = true; ! fl = getparamvalue (hp1, pnum++, &valparam); flinhibitnilcoercion = false; --- 2901,2905 ---- flinhibitnilcoercion = true; ! lfl = getparamvalue (hp1, pnum++, &valparam); flinhibitnilcoercion = false; *************** *** 2912,2916 **** goto error; ! if (!fl) /*must be nil coercion error*/ continue; --- 2908,2912 ---- goto error; ! if (!lfl) /*must be nil coercion error*/ continue; *************** *** 3328,3332 **** boolean langipccomplexmessage (hdltreenode hparam1, tyvaluerecord *vreturned) { ! hdlhashtable htable; tyipcaddress ipcaddress; --- 3324,3328 ---- boolean langipccomplexmessage (hdltreenode hparam1, tyvaluerecord *vreturned) { ! #pragma unused (vreturned) hdlhashtable htable; tyipcaddress ipcaddress; *************** *** 3344,3348 **** boolean langipctablemessage (hdltreenode hparam1, tyvaluerecord *vreturned) { ! /* 5.1.5 dmb: use tablesortedinversesearch for guest databases --- 3340,3344 ---- boolean langipctablemessage (hdltreenode hparam1, tyvaluerecord *vreturned) { ! #pragma unused (vreturned) /* 5.1.5 dmb: use tablesortedinversesearch for guest databases *************** *** 3382,3386 **** static boolean langipcfasterror (bigstring bs, ptrvoid refcon) { ! long n; OSErr err; --- 3378,3382 ---- static boolean langipcfasterror (bigstring bs, ptrvoid refcon) { ! #pragma unused (refcon) long n; OSErr err; *************** *** 3986,3990 **** static pascal OSErr handleshowmenunode (const AppleEvent *event, AppleEvent *reply, long refcon) { ! /* 4.1b14 dmb: added outline parameter; can't count on outline data not changing --- 3982,3986 ---- static pascal OSErr handleshowmenunode (const AppleEvent *event, AppleEvent *reply, long refcon) { ! #pragma unused (reply, refcon) /* 4.1b14 dmb: added outline parameter; can't count on outline data not changing *************** *** 4065,4069 **** static pascal OSErr handleyield (const AppleEvent *event, AppleEvent *reply, long refcon) { ! processyield (); --- 4061,4065 ---- static pascal OSErr handleyield (const AppleEvent *event, AppleEvent *reply, long refcon) { ! #pragma unused (event, reply, refcon) processyield (); *************** *** 4211,4215 **** static pascal OSErr langipcfastgetobject (AppleEvent *event, AppleEvent *reply, long refcon) { ! /* 7/3/92 DW: this one will be hot! --- 4207,4211 ---- static pascal OSErr langipcfastgetobject (AppleEvent *event, AppleEvent *reply, long refcon) { ! #pragma unused (refcon) /* 7/3/92 DW: this one will be hot! *************** *** 4221,4229 **** long curA5; ! #if flcomponent ! curA5 = SetUpAppA5 (); ! #endif landpushfastcontext (&savecontext); --- 4217,4225 ---- long curA5; ! #if flcomponent ! curA5 = SetUpAppA5 (); ! #endif landpushfastcontext (&savecontext); *************** *** 4237,4243 **** ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! ! { Handle hcopy; boolean fl = false; --- 4233,4238 ---- ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! { Handle hcopy; boolean fl = false; *************** *** 4255,4266 **** if (!fl) goto exit; ! } ! #else ! if (!getpackedobject (desc.dataHandle, &desc.dataHandle)) /*consumes input handle*/ ! goto exit; ! ! #endif desc.descriptorType = 'data'; --- 4250,4261 ---- if (!fl) goto exit; ! } ! #else ! if (!getpackedobject (desc.dataHandle, &desc.dataHandle)) /*consumes input handle*/ ! goto exit; ! ! #endif desc.descriptorType = 'data'; *************** *** 4287,4291 **** static pascal OSErr langipcfastsetobject (AppleEvent *event, AppleEvent *reply, long refcon) { ! /* 7/3/92 DW: this one will be hot! --- 4282,4286 ---- static pascal OSErr langipcfastsetobject (AppleEvent *event, AppleEvent *reply, long refcon) { ! #pragma unused (refcon) /* 7/3/92 DW: this one will be hot! *************** *** 4297,4305 **** Boolean fl; ! #if flcomponent && TARGET_API_MAC_OS8 long curA5 = SetUpAppA5 (); ! #endif landpushfastcontext (&savecontext); --- 4292,4300 ---- Boolean fl; ! #if flcomponent && TARGET_API_MAC_OS8 long curA5 = SetUpAppA5 (); ! #endif landpushfastcontext (&savecontext); *************** *** 4319,4341 **** } ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! ! { Handle hcopy1, hcopy2; ! copydatahandle (&desc1, &hcopy1); ! copydatahandle (&desc2, &hcopy2); ! if (!setpackedobject (hcopy1, hcopy2)) goto exit; ! } ! ! #else ! ! if (!setpackedobject (desc1.dataHandle, desc2.dataHandle)) /*consumes handles*/ ! goto exit; ! ! #endif fl = true; --- 4314,4335 ---- } ! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ ! { Handle hcopy1, hcopy2; ! copydatahandle (&desc1, &hcopy1); ! copydatahandle (&desc2, &hcopy2); ! if (!setpackedobject (hcopy1, hcopy2)) goto exit; ! } ! ! #else ! ! if (!setpackedobject (desc1.dataHandle, desc2.dataHandle)) /*consumes handles*/ ! goto exit; ! ! #endif fl = true; *************** *** 4659,4663 **** static boolean langipceventhook (EventRecord *ev, WindowPtr w) { ! /* 7/3/91 dmb: under system 7, we fork off a new thread for every --- 4653,4657 ---- static boolean langipceventhook (EventRecord *ev, WindowPtr w) { ! #pragma unused (w) /* 7/3/91 dmb: under system 7, we fork off a new thread for every Index: langsystypes.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langsystypes.c,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -d -r1.6 -r1.6.2.1 *** langsystypes.c 20 Aug 2005 11:11:48 -0000 1.6 --- langsystypes.c 2 Feb 2006 18:39:59 -0000 1.6.2.1 *************** *** 670,675 **** setemptystring (bs); ! // get each path element out of the alias while (GetAliasInfo (h, ix, bsinfo) == noErr) { --- 670,693 ---- setemptystring (bs); ! // get each path element out of the alias + // kw - 2006-02-02 --- todo: replace this + /* extern OSErr + GetAliasInfo( + AliasHandle alias, + AliasInfoType index, + Str63 theString) */ + + // with this + /* + extern OSStatus + FSCopyAliasInfo( + AliasHandle inAlias, + HFSUniStr255 * targetName, /% can be NULL %/ + HFSUniStr255 * volumeName, /% can be NULL %/ + CFStringRef * pathString, /% can be NULL %/ + FSAliasInfoBitmap * whichInfo, /% can be NULL %/ + FSAliasInfo * info) /% can be NULL %/ + */ while (GetAliasInfo (h, ix, bsinfo) == noErr) { Index: langops.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langops.c,v retrieving revision 1.4.6.1 retrieving revision 1.4.6.2 diff -C2 -d -r1.4.6.1 -r1.4.6.2 *** langops.c 31 Jan 2006 16:43:31 -0000 1.4.6.1 --- langops.c 2 Feb 2006 18:39:59 -0000 1.4.6.2 *************** *** 162,167 **** #if LONGINT_LONGDATE == 1 ! /* 38 */ ,{'comp', STR_longlongtype }, ! /* 39 */ {'ldt ', STR_longdatetype } #endif }; --- 162,167 ---- #if LONGINT_LONGDATE == 1 ! /* 38 */ ,{'comp', STR_longlong }, ! /* 39 */ {'ldt ', STR_longdate } #endif }; Index: langvalue.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langvalue.c,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -C2 -d -r1.8.2.1 -r1.8.2.2 *** langvalue.c 31 Jan 2006 16:43:31 -0000 1.8.2.1 --- langvalue.c 2 Feb 2006 18:39:59 -0000 1.8.2.2 *************** *** 228,244 **** #if LONGINT_LONGDATE == 1 ! boolean setlonglongintvalue (tylonglongint x, tyvaluerecord *val) { /* ! set val to be a the long long value x. can't fail. */ ! ! (*val).valuetype = longlongintvaluetype; ! ! **(*val).data.longlongintvalue = x; ! (*(tyfastflagsvaluerecord *) val).flags = 0; ! ! return (true); } /* setlonglongintvalue */ #endif --- 228,240 ---- #if LONGINT_LONGDATE == 1 ! boolean setlonglongintvalue (Handle x, tyvaluerecord *val) { /* ! set val to be a the long long value x. */ ! if (x == nil) ! newclearhandle(sizeof(tylonglongint), &x); ! return(setheapvalue(x, longlongintvaluetype, val)); } /* setlonglongintvalue */ #endif *************** *** 246,262 **** #if LONGINT_LONGDATE == 1 ! boolean setlongdatevalue (tylonglongint x, tyvaluerecord *val) { ! ! /* ! set val to be a the long date value x. can't fail. ! */ ! ! (*val).valuetype = longdatetimevaluetype; ! ! **(*val).data.longlongintvalue = x; ! ! (*(tyfastflagsvaluerecord *) val).flags = 0; ! ! return (true); } /* setlongdatevalue */ #endif --- 242,252 ---- #if LONGINT_LONGDATE == 1 ! boolean setlongdatevalue (Handle x, tyvaluerecord *val) { ! // set val to be a the long date value x. ! ! if (x == nil) ! newclearhandle(sizeof(tylonglongint), &x); ! ! return(setheapvalue(x, longdatetimevaluetype, val)); } /* setlongdatevalue */ #endif *************** *** 2076,2079 **** --- 2066,2070 ---- + #if LONGINT_LONGDATE == 1 static boolean longlongrangeerror (double f) { *************** *** 2091,2095 **** return (false); } /*longrangeerror*/ ! boolean coercetolong (tyvaluerecord *v) { --- 2082,2086 ---- return (false); } /*longrangeerror*/ ! #endif boolean coercetolong (tyvaluerecord *v) { *************** *** 2610,2618 **** case stringvaluetype: { bigstring bs; ! unsigned long time; pullstringvalue (v, bs); ! if (!stringtotime (bs, &time)) { langerror (datecoerceerror); --- 2601,2609 ---- case stringvaluetype: { bigstring bs; ! unsigned long ltime; // kw - 2006-02-02 renamed due to shadow warning pullstringvalue (v, bs); ! if (!stringtotime (bs, <ime)) { langerror (datecoerceerror); *************** *** 2621,2625 **** } ! x = time; break; --- 2612,2616 ---- } ! x = ltime; break; *************** *** 3074,3108 **** case binaryvaluetype: ! #if noextended ! { ! long double x; ! extended80 x80; ! ! /*first do type & length checking, resulting in x80 value in v*/ ! ! if (!coercebinaryval (v, doublevaluetype, sizeof (extended80), novaluetype)) ! return (false); ! ! /*now convert to actual double value*/ ! ! ! #ifdef WIN95VERSION ! memmove (&x80, *((*v).data.doublevalue), sizeof (x80)); ! convertFromMacExtended (&x, &x80); ! #else ! x80 = (**(extended80 **) (*v).data.doublevalue); ! safex80told (&x80, &x); ! #endif ! ! return (setdoublevalue (x, v)); ! } ! ! #else ! ! return (coercebinaryval (v, doublevaluetype, sizeof (double), novaluetype)); ! ! #endif case listvaluetype: --- 3065,3096 ---- case binaryvaluetype: ! #if noextended ! { ! long double lx; // kw - 2006-02-02 renamed due to shadow warning ! extended80 x80; ! /*first do type & length checking, resulting in x80 value in v*/ ! if (!coercebinaryval (v, doublevaluetype, sizeof (extended80), novaluetype)) ! return (false); ! ! /*now convert to actual double value*/ ! ! #ifdef WIN95VERSION ! memmove (&x80, *((*v).data.doublevalue), sizeof (x80)); ! ! convertFromMacExtended (&lx, &x80); ! #else ! x80 = (**(extended80 **) (*v).data.doublevalue); ! ! safex80told (&x80, &lx); ! #endif ! ! return (setdoublevalue (lx, v)); ! } ! ! #else ! return (coercebinaryval (v, doublevaluetype, sizeof (double), novaluetype)); ! #endif case listvaluetype: *************** *** 5636,5641 **** ! static boolean getvalidstringindex (tyvaluerecord *vstring, bigstring bsname, tyvaluerecord *vindex, long *index) { ! /* 2.1b3 dmb: if string is a binary, account for binary subtype --- 5624,5634 ---- ! static boolean ! getvalidstringindex ( ! tyvaluerecord *vstring, ! bigstring bsname, ! tyvaluerecord *vindex, ! long *lindex) // kw - 2006-02-02 renamed due to shadow warning ! { /* 2.1b3 dmb: if string is a binary, account for binary subtype *************** *** 5665,5669 **** ix += sizeof (OSType); ! *index = ix; return (true); --- 5658,5662 ---- ix += sizeof (OSType); ! *lindex = ix; return (true); Index: dialogs.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/dialogs.c,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -d -r1.7 -r1.7.2.1 *** dialogs.c 30 Sep 2005 15:29:18 -0000 1.7 --- dialogs.c 2 Feb 2006 18:39:59 -0000 1.7.2.1 *************** *** 897,901 **** static void passwordprocesskey (DialogPtr pdialog, char chkb, EventRecord *ev, short *item) { ! TEHandle hte; char *buffer; --- 897,901 ---- static void passwordprocesskey (DialogPtr pdialog, char chkb, EventRecord *ev, short *item) { ! #pragma unused(item) TEHandle hte; char *buffer; *************** *** 1084,1091 **** #if TARGET_API_MAC_CARBON == 1 { ! WindowRef pWindow = GetDialogWindow(pdialog); CGrafPtr thePort = GetDialogPort(pdialog); ! SelectWindow(pWindow); QDFlushPortBuffer(thePort, nil); } --- 1084,1091 ---- #if TARGET_API_MAC_CARBON == 1 { ! WindowRef lWindow = GetDialogWindow(pdialog); // kw - 2006-02-02 renamed due to shadow warning CGrafPtr thePort = GetDialogPort(pdialog); ! SelectWindow(lWindow); QDFlushPortBuffer(thePort, nil); } Index: memory.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/memory.c,v retrieving revision 1.6 retrieving revision 1.6.4.1 diff -C2 -d -r1.6 -r1.6.4.1 *** memory.c 21 Mar 2005 02:43:14 -0000 1.6 --- memory.c 2 Feb 2006 18:39:59 -0000 1.6.4.1 *************** *** 871,875 **** boolean prepareforgrowing (Handle h) { ! /* like newgrowinghandle, but for an already-existing handle. the --- 871,875 ---- boolean prepareforgrowing (Handle h) { ! #pragma unused(h) /* like newgrowinghandle, but for an already-existing handle. the Index: fileloop.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/fileloop.c,v retrieving revision 1.5 retrieving revision 1.5.4.1 diff -C2 -d -r1.5 -r1.5.4.1 *** fileloop.c 24 Jan 2005 17:16:47 -0000 1.5 --- fileloop.c 2 Feb 2006 18:39:59 -0000 1.5.4.1 *************** *** 55,59 **** static boolean fileloopreleaseitem (Handle h) { ! /* callback routine that disposes of one of our items. since there are no --- 55,59 ---- static boolean fileloopreleaseitem (Handle h) { ! #pragma unused (h) /* callback routine that disposes of one of our items. since there are no |