|
From: <cre...@us...> - 2007-02-26 19:47:07
|
Revision: 1629
http://svn.sourceforge.net/frontierkernel/?rev=1629&view=rev
Author: creecode
Date: 2007-02-26 11:46:59 -0800 (Mon, 26 Feb 2007)
Log Message:
-----------
formatting tweaks
Modified Paths:
--------------
Frontier/branches/Frontier_Long_File_Paths/Common/SystemHeaders/land.h
Frontier/branches/Frontier_Long_File_Paths/Common/UserLandIACToolkit/land.c
Frontier/branches/Frontier_Long_File_Paths/Common/UserLandIACToolkit/landgetparam.c
Frontier/branches/Frontier_Long_File_Paths/Common/UserLandIACToolkit/landpush.c
Frontier/branches/Frontier_Long_File_Paths/Common/UserLandIACToolkit/landverbarray.c
Frontier/branches/Frontier_Long_File_Paths/Common/headers/kernelverbs.h
Frontier/branches/Frontier_Long_File_Paths/Common/source/langdialog.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/langparser.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/langparser.y
Frontier/branches/Frontier_Long_File_Paths/Common/source/langtmpstack.c
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/SystemHeaders/land.h
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/SystemHeaders/land.h 2007-02-25 04:59:30 UTC (rev 1628)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/SystemHeaders/land.h 2007-02-26 19:46:59 UTC (rev 1629)
@@ -348,6 +348,7 @@
macsystem6 /*using System 6 INIT as transport mechanism*/
/*room for support of other IAC protocols in our super-protocol*/
+
} tytransport;
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/UserLandIACToolkit/land.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/UserLandIACToolkit/land.c 2007-02-25 04:59:30 UTC (rev 1628)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/UserLandIACToolkit/land.c 2007-02-26 19:46:59 UTC (rev 1629)
@@ -120,6 +120,7 @@
pascal hdllandglobals landgetglobals (void) {
return (landgetlandglobals ()); /*return value of asm routine*/
+
} /*landgetglobals*/
@@ -366,7 +367,7 @@
if (!landcomplexsend (hverb, &hresult))
return (false);
-
+
landnextparamisoptional (hresult); /*don't require that any reply values exist*/
if (landgetparam (hresult, errornumberkey, notype, &errorparam)) { /*got an error*/
@@ -376,8 +377,9 @@
landseterror (noErr); /*clear coercion error*/
*iderror = errAEEventFailed;
+
}
-
+
landnextparamisoptional (hresult); /*don't require next parameter...*/
if (*iderror == 0) { /*'errn' was zero, not an error; check for direct param*/
@@ -385,6 +387,7 @@
fl = true; /*not an error*/
landgetparam (hresult, returnedvaluekey, notype, result); /*take it if it's there*/
+
}
else {
@@ -399,6 +402,7 @@
GetIndString (bserror, (**hg).iderrorlist, ixstring);
#endif
+
}
}
}
@@ -415,6 +419,7 @@
landdisposeverb (hresult);
return (fl);
+
} /*landsendverb*/
@@ -443,6 +448,7 @@
landdisposeverb (hv);
return (fl);
+
} /*landhandleverb*/
@@ -521,12 +527,6 @@
return (landsystem7eventfilter (ev));
- /*
- if ((**hg).transport == macsystem7)
- return (landsystem7eventfilter (ev));
- else
- return (landsystem6eventfilter (ev));
- */
} /*landeventfilter*/
#endif
@@ -699,19 +699,13 @@
*/
register hdllandglobals hg = landgetglobals ();
- /*
- SysEnvRec world;
- */
+
long result;
hdllandglobals hglobals;
tyapplicationid id;
- #if TARGET_API_MAC_CARBON == 1
landzone = LMGetApplZone();
- #else
- landzone = GetZone ();
- #endif
-
+
#if !TARGET_API_MAC_CARBON
landresmap = LMGetTopMapHndl ();
#endif
@@ -726,40 +720,13 @@
landsetlandglobals (hglobals); /*stick the handle in*/
hg = hglobals;
+
}
(**hg).transport = macsystem7;
(**hg).applicationid = ' ';
- /*
- (**hg).iderrorlist = 129;
-
- (**hg).flconnected = false;
-
- (**hg).flacceptanyverb = false;
-
- (**hg).verbarray = nil;
-
- (**hg).handleverbroutine = nil;
-
- (**hg).breakembraceroutine = nil;
-
- (**hg).macopenapproutine = nil;
-
- (**hg).macopendocroutine = nil;
-
- (**hg).macprintdocroutine = nil;
-
- (**hg).macquitapproutine = nil;
-
- (**hg).mactypes = nil;
-
- (**hg).hqueue = nil;
-
- (**hg).ipcrefnum = 0;
- */
-
(**hg).breakembraceroutine = &landefaultbreakembrace;
if (!landgetappcreator (&id))
@@ -781,9 +748,8 @@
(**hg).flconnected = true;
- //landsetmemstats (); /*copy freemem into globals -- for use in stats window*/
-
return (true);
+
} /*landinit*/
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/UserLandIACToolkit/landgetparam.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/UserLandIACToolkit/landgetparam.c 2007-02-25 04:59:30 UTC (rev 1628)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/UserLandIACToolkit/landgetparam.c 2007-02-26 19:46:59 UTC (rev 1629)
@@ -215,7 +215,6 @@
#endif
return (true);
+
} /*landgettextparam*/
-
-
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/UserLandIACToolkit/landpush.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/UserLandIACToolkit/landpush.c 2007-02-25 04:59:30 UTC (rev 1628)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/UserLandIACToolkit/landpush.c 2007-02-26 19:46:59 UTC (rev 1629)
@@ -31,7 +31,6 @@
#include "landinternal.h"
-
pascal boolean landpushparam (hdlverbrecord hverb, typaramtype type, Handle hval, void *pval, long len, typaramkeyword key) {
/*
@@ -55,26 +54,27 @@
(**hv).ctparams++; /*added room for another param*/
return (true);
+
} /*landpushparam*/
pascal boolean landpushintparam (hdlverbrecord hverb, short x, typaramkeyword key) {
return (landpushparam (hverb, inttype, nil, &x, longsizeof (x), key));
+
} /*landpushintparam*/
pascal boolean landpushlongparam (hdlverbrecord hverb, long x, typaramkeyword key) {
return (landpushparam (hverb, longtype, nil, &x, longsizeof (x), key));
+
} /*landpushlongparam*/
pascal boolean landpushstringparam (hdlverbrecord hverb, bigstring bs, typaramkeyword key) {
return (landpushparam (hverb, texttype, nil, bs + 1, stringlength (bs), key));
+
} /*landpushstringparam*/
-
-
-
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/UserLandIACToolkit/landverbarray.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/UserLandIACToolkit/landverbarray.c 2007-02-25 04:59:30 UTC (rev 1628)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/UserLandIACToolkit/landverbarray.c 2007-02-26 19:46:59 UTC (rev 1629)
@@ -31,7 +31,6 @@
#include "landinternal.h"
-
pascal boolean landaddclass (tyverbclass class) {
register hdllandglobals hg = landgetglobals ();
@@ -48,6 +47,7 @@
}
return (fl);
+
} /*landaddclass*/
@@ -96,6 +96,7 @@
*/
return (landaddverbtoken (token, false));
+
} /*landaddverb*/
@@ -107,8 +108,6 @@
*/
return (landaddverbtoken (token, true));
- } /*landaddfastverb*/
+
+ } /*landaddfastverb*/
-
-
-
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/headers/kernelverbs.h
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/headers/kernelverbs.h 2007-02-25 04:59:30 UTC (rev 1628)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/headers/kernelverbs.h 2007-02-26 19:46:59 UTC (rev 1629)
@@ -28,7 +28,7 @@
#define kernelverbsinclude
-/*prototypes for initialization*/
+// prototypes
extern boolean fileinitverbs (void); /*fileverbs.c*/
@@ -46,14 +46,22 @@
extern boolean windowinitverbs (void); /*shellwindowverbs.c*/
-extern boolean htmlinitverbs (void); /*langhtml.c*/
-extern boolean quicktimeinitverbs (void); /*langquicktime.c*/
+#pragma mark === langhtml.c ===
+extern boolean htmlinitverbs (void);
+
+
+#pragma mark === langquicktime.c ===
+
+extern boolean quicktimeinitverbs (void);
+
+
extern boolean regexpinitverbs (void); /* langregexp.c */
extern boolean mathinitverbs (void); /* langmath.c */
extern boolean cryptinitverbs (void); /* langcrypt.c */
-extern boolean sqliteinitverbs (void); /* langsqlite.c */
\ No newline at end of file
+extern boolean sqliteinitverbs (void); /* langsqlite.c */
+
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/source/langdialog.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/source/langdialog.c 2007-02-25 04:59:30 UTC (rev 1628)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/source/langdialog.c 2007-02-26 19:46:59 UTC (rev 1629)
@@ -94,22 +94,25 @@
}
return (true);
+
} /*langvaliddialogitem*/
-static boolean langdialoggetitemparam (hdltreenode hfirst, short pnum, short *itemnum) {
+static boolean langdialoggetitemparam ( hdltreenode hfirst, short pnum, short *itemnum ) {
- if (!langdialogrunning ()) { /*factored run-time check*/
+ if (!langdialogrunning ()) { // factored run-time check
- langparamerror (dialognotrunningerror, bsfunctionname);
+ langparamerror ( dialognotrunningerror, handleFunctionName );
return (false);
+
}
-
+
if (!getintvalue (hfirst, pnum, itemnum))
return (false);
+
+ return (langvaliddialogitem (*itemnum));
- return (langvaliddialogitem (*itemnum));
} /*langdialoggetitemparam*/
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/source/langparser.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/source/langparser.c 2007-02-25 04:59:30 UTC (rev 1628)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/source/langparser.c 2007-02-26 19:46:59 UTC (rev 1629)
@@ -1902,3 +1902,4 @@
} break; }
goto enstack;
}
+
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/source/langparser.y
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/source/langparser.y 2007-02-25 04:59:30 UTC (rev 1628)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/source/langparser.y 2007-02-26 19:46:59 UTC (rev 1629)
@@ -1526,6 +1526,3 @@
parseerror ((ptrstring) s);
} /*yyerror*/
-
-
-
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/source/langtmpstack.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/source/langtmpstack.c 2007-02-25 04:59:30 UTC (rev 1628)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/source/langtmpstack.c 2007-02-26 19:46:59 UTC (rev 1629)
@@ -66,7 +66,7 @@
if (currenthashtable == nil)
return;
- lockhandle ((Handle) currenthashtable);
+ lockhandle ((Handle) currenthashtable);
p = (**currenthashtable).tmpstack;
@@ -79,10 +79,13 @@
disposevaluerecord (*p, false);
initvalue (p, novaluetype);
+
}
+
} /*for*/
unlockhandle ((Handle) currenthashtable);
+
} /*cleartmpstack*/
@@ -116,7 +119,9 @@
*p = *vpush;
return (true);
+
}
+
} /*for*/
// langerror (tmpstackoverflowerror); /*loop terminated, no room in tmpstack*/
@@ -131,6 +136,7 @@
(**currenthashtable).cttmpstack += ctgrowtmpstack;
return (true);
+
} /*pushtmpstackvalue*/
@@ -151,6 +157,7 @@
val.data.binaryvalue = h;
return (pushtmpstackvalue (&val));
+
} /*pushtmpstack*/
@@ -182,10 +189,13 @@
initvalue (p, novaluetype); /*nil the entry so it can be re-used*/
return (true);
+
}
+
} /*while*/
return (false); /*didn't find it*/
+
} /*removeheaptmp*/
@@ -254,10 +264,12 @@
(*val).fltmpstack = false;
return (true);
+
}
}
return (false);
+
} /*exemptfromtmpstack*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|