Menu
▾
▴
[frontierkernel-commits] Frontier/Common/UserLandIACToolkit land.c,1.2,1.3 landsystem7.c,1.3,1.4
|
From: Andre R. <and...@us...> - 2004-10-29 20:59:54
|
Update of /cvsroot/frontierkernel/Frontier/Common/UserLandIACToolkit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17436 Modified Files: land.c landsystem7.c Log Message: Fixed GCC compiler warnings. Index: landsystem7.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/UserLandIACToolkit/landsystem7.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** landsystem7.c 24 Oct 2004 16:52:16 -0000 1.3 --- landsystem7.c 29 Oct 2004 20:59:44 -0000 1.4 *************** *** 132,136 **** AEEventID eventID; DescType typeCode; ! int ctbytes; if (AEGetAttributePtr(ev, keyEventIDAttr, typeType, &typeCode, --- 132,136 ---- AEEventID eventID; DescType typeCode; ! Size ctbytes; if (AEGetAttributePtr(ev, keyEventIDAttr, typeType, &typeCode, *************** *** 174,177 **** --- 174,180 ---- */ + + #if TARGET_API_MAC_OS8 + static void MakePascalStringWLen (StringPtr theDest, int theDestLen, char *theSrc, int theSrcLen) { *************** *** 192,197 **** - #if TARGET_API_MAC_OS8 - static OSErr HCProgramToPortAndLoc (char *theName, short len, LocationNameRec *theLoc, PortInfoRec *thePort) { --- 195,198 ---- *************** *** 437,440 **** --- 438,445 ---- + #if !TARGET_API_MAC_CARBON + //Code change by Timothy Paustian Friday, July 21, 2000 10:40:43 PM + //we don't do anything on Carbon because we can't use this anyway. + static pascal Boolean landbrowserfilter (LocationNamePtr ln, PortInfoPtr port) { *************** *** 446,452 **** #ifdef flcomponent ! ! long curA5 = SetUpAppA5 (); ! #endif --- 451,455 ---- #ifdef flcomponent ! long curA5 = SetUpAppA5 (); #endif *************** *** 456,462 **** #ifdef flcomponent ! ! RestoreA5 (curA5); ! #endif --- 459,463 ---- #ifdef flcomponent ! RestoreA5 (curA5); #endif *************** *** 473,492 **** ! #if !TARGET_RT_MAC_CFM ! ! #define landbrowserfilterUPP (&landbrowserfilter) ! #else - #if TARGET_API_MAC_CARBON == 1 - //Code change by Timothy Paustian Friday, July 21, 2000 10:40:43 PM - //we don't do anything because we can't use this anyway. #else ! ! static RoutineDescriptor landbrowserfilterDesc = BUILD_ROUTINE_DESCRIPTOR (uppPPCFilterProcInfo, landbrowserfilter); ! #define landbrowserfilterUPP (&landbrowserfilterDesc) #endif - #endif --- 474,488 ---- ! #if !TARGET_RT_MAC_CFM ! #define landbrowserfilterUPP (&landbrowserfilter) #else ! ! static RoutineDescriptor landbrowserfilterDesc = BUILD_ROUTINE_DESCRIPTOR (uppPPCFilterProcInfo, landbrowserfilter); ! #define landbrowserfilterUPP (&landbrowserfilterDesc) ! #endif #endif *************** *** 798,807 **** return (true); /*loop completed, all params popped with no errors*/ - - error: - - landdisposeverb (hv); - - return (false); } /*landsystem7unpackverb*/ --- 794,797 ---- *************** *** 991,995 **** ! static pascal boolean replyidvisit (hdlsys7transportinfo ht, long id) { return ((**ht).replyid == (short) id); --- 981,987 ---- ! static pascal boolean replyidvisit (Handle htinfo, long id) { ! ! hdlsys7transportinfo ht = (hdlsys7transportinfo) htinfo; return ((**ht).replyid == (short) id); *************** *** 1375,1386 **** - static pascal Boolean landsystem7filterroutine (EventRecord *ev, long returnid, long transactionid, AEAddressDesc *sender) { - - #pragma unused (ev, returnid, transactionid, sender) - - return (true); /*accept the event*/ - } /*landsystem7filterroutine*/ - - pascal boolean landsystem7geteventrecords (hdlverbrecord hverb, AppleEvent *event, AppleEvent *reply) { --- 1367,1370 ---- *************** *** 1599,1608 **** } /*landsystem7send*/ - /* - static pascal boolean timeoutvisit (hdlsys7transportinfo ht, long ticksnow) { - - return ((**ht).waketime <= (unsigned long) ticksnow); //sleeping too long - } /*timeoutvisit*/ - static pascal void landsystem7checktimeouts (EventRecord *ev) { --- 1583,1586 ---- *************** *** 1747,1751 **** //A5 worlds make no sense on PPC so why pass this as our refcon #if TARGET_API_MAC_CARBON == 1 - long landCode = 'LAND'; errcode = AEInstallEventHandler (class, token, handler, (long) nil, true); #else --- 1725,1728 ---- *************** *** 1764,1772 **** #if TARGET_API_MAC_CARBON == 1 ! return (landsystem7installhandlerUPP (class, id, NewAEEventHandlerUPP (handler))); #else ! return (landsystem7installhandlerUPP (class, id, NewAEEventHandlerProc (handler))); #endif --- 1741,1749 ---- #if TARGET_API_MAC_CARBON == 1 ! return (landsystem7installhandlerUPP (class, id, NewAEEventHandlerUPP ((AEEventHandlerProcPtr) handler))); #else ! return (landsystem7installhandlerUPP (class, id, NewAEEventHandlerProc ((AEEventHandlerProcPtr) handler))); #endif *************** *** 1778,1786 **** #if TARGET_API_MAC_CARBON == 1 ! return (landsystem7installfasthandlerUPP (class, token, NewAEEventHandlerUPP (handler))); #else ! return (landsystem7installfasthandlerUPP (class, token, NewAEEventHandlerProc (handler))); #endif --- 1755,1763 ---- #if TARGET_API_MAC_CARBON == 1 ! return (landsystem7installfasthandlerUPP (class, token, NewAEEventHandlerUPP ((AEEventHandlerProcPtr) handler))); #else ! return (landsystem7installfasthandlerUPP (class, token, NewAEEventHandlerProc ((AEEventHandlerProcPtr) handler))); #endif *************** *** 1797,1801 **** #endif ! return (landsystem7installhandlerUPP (class, typeWildCard, landsystem7handleeventUPP)); } /*landsystem7addclass*/ --- 1774,1778 ---- #endif ! return (landsystem7installhandlerUPP (class, typeWildCard, landsystem7handleeventUPP)); } /*landsystem7addclass*/ *************** *** 1950,1954 **** /* ! fl = landsystem7unpackdesc (&desc, key, param); /*may set desc's data to nil%/ AEDisposeDesc (&desc); --- 1927,1931 ---- /* ! fl = landsystem7unpackdesc (&desc, key, param); /%may set desc's data to nil%/ AEDisposeDesc (&desc); *************** *** 1990,1994 **** /* ! fl = landsystem7unpackdesc (&desc, key, param); /*may set desc's data to nil%/ AEDisposeDesc (&desc); --- 1967,1971 ---- /* ! fl = landsystem7unpackdesc (&desc, key, param); /%may set desc's data to nil%/ AEDisposeDesc (&desc); *************** *** 2058,2062 **** ! static pascal OSErr whyinternational (DescType itxt, Ptr x, long len, DescType text, long refcon, AEDesc *result) { if (*(short *) x != smRoman) /*can't treat this as plain text*/ --- 2035,2039 ---- ! static pascal OSErr whyinternational (DescType itxt, const void *x, Size len, DescType text, SInt32 refcon, AEDesc *result) { if (*(short *) x != smRoman) /*can't treat this as plain text*/ Index: land.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/UserLandIACToolkit/land.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** land.c 23 Oct 2004 21:30:06 -0000 1.2 --- land.c 29 Oct 2004 20:59:44 -0000 1.3 *************** *** 57,61 **** static THz landzone; ! static Handle landresmap; static short landresfile; --- 57,63 ---- static THz landzone; ! #if !TARGET_API_MAC_CARBON ! static Handle landresmap; ! #endif static short landresfile; *************** *** 115,121 **** pascal hdllandglobals landgetglobals (void) { ! ! /*extern pascal hdllandglobals landgetlandglobals (); /*implemented in landstorage.a.¹*/ ! return (landgetlandglobals ()); /*return value of asm routine*/ } /*landgetglobals*/ --- 117,121 ---- pascal hdllandglobals landgetglobals (void) { ! return (landgetlandglobals ()); /*return value of asm routine*/ } /*landgetglobals*/ *************** *** 511,515 **** /* ! if (landwindoweventfilter (ev)) /*event consumed by stats window%/ return (true); */ --- 511,515 ---- /* ! if (landwindoweventfilter (ev)) /%event consumed by stats window%/ return (true); */ *************** *** 639,643 **** register hdllandglobals hg = landgetglobals (); ! if ((**hg).transport == macsystem7) /*DW 6/25/91%/ return (false); --- 639,643 ---- register hdllandglobals hg = landgetglobals (); ! if ((**hg).transport == macsystem7) /%DW 6/25/91%/ return (false); *************** *** 650,656 **** static landqueuepopcallback threadvisit; ! static pascal boolean sleepingthreadvisit (hdltransportinfo ht, long refcon) { ! if ((*threadvisit) ((**ht).hthread, refcon)) { processwake ((**ht).hthread); --- 650,658 ---- static landqueuepopcallback threadvisit; ! static pascal boolean sleepingthreadvisit (Handle htinfo, long refcon) { ! hdltransportinfo ht = (hdltransportinfo) htinfo; ! ! if ((*threadvisit) ((Handle) (**ht).hthread, refcon)) { processwake ((**ht).hthread); *************** *** 777,781 **** (**hg).flconnected = true; ! /**landsetmemstats (); /*copy freemem into globals -- for use in stats window*/ return (true); --- 779,783 ---- (**hg).flconnected = true; ! //landsetmemstats (); /*copy freemem into globals -- for use in stats window*/ return (true); |
