Menu
▾
▴
[frontierkernel-commits] Frontier/Common/source langxml.c,1.2,1.3 langstartup.c,1.2,1.3 langops.c,1.2,1.3 langpack.c,1.2,1.3 langwinipc.c,1.2,1.3 langsystypes.c,1.2,1.3 langscan.c,1.2,1.3 langverbs.c,1.3,1.4 langvalue.c,1.3,1.4 langtree.c,1.3,1.4
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22795 Modified Files: langxml.c langstartup.c langops.c langpack.c langwinipc.c langsystypes.c langscan.c langverbs.c langvalue.c langtree.c Log Message: Fixed GCC compiler warnings. Index: langverbs.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langverbs.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** langverbs.c 23 Oct 2004 22:33:15 -0000 1.3 --- langverbs.c 31 Oct 2004 18:48:51 -0000 1.4 *************** *** 585,592 **** case controlkeyfunc: return (kb.flcontrolkey); ! } /*switch*/ - return (false); } /*keyboardmodifierverb*/ --- 585,593 ---- case controlkeyfunc: return (kb.flcontrolkey); ! ! default: ! return (false); } /*switch*/ } /*keyboardmodifierverb*/ *************** *** 607,614 **** err = PPostEvent (keyDown, (keycode << 8) + keychar, &ev); ! /***ev.evtQModifiers = btnState; /*the mouse is up%/ return (err == noErr); ! } /*presskeyverb*/ --- 608,616 ---- err = PPostEvent (keyDown, (keycode << 8) + keychar, &ev); ! //ev.evtQModifiers = btnState; /%the mouse is up%/ return (err == noErr); ! } /%presskeyverb%/ ! */ *************** *** 662,670 **** */ - hdlhashtable hcurrent = currenthashtable; boolean fl; - // pophashtable (); - fl = copyvaluerecord (*v, vcopy); --- 664,669 ---- *************** *** 672,677 **** exemptfromtmpstack (vcopy); - // pushhashtable (hcurrent); - return (fl); } /*copyexemptvalue*/ --- 671,674 ---- *************** *** 1374,1405 **** ! #if MACVERSION ! ! #if TARGET_API_MAC_CARBON ! ! static boolean callxcmdverb (hdltreenode hparam1, tyvaluerecord *vreturned) { ! ! /* ! 2004-10-21 aradke: XCMDs and XCFNs are not supported on OS X ! */ ! ! bigstring bssourcemessage = "\pCan't call Ò^0Ó because XCMDs and XFCNs are not supported in the Carbon version."; ! bigstring bserrormessage; ! bigstring bsxcmd; ! hdlhashtable htable; ! tyvaluerecord val; ! hdlhashnode hnode; ! ! if (!getvarvalue (hparam1, 1, &htable, bsxcmd, &val, &hnode)) ! return (false); ! ! parsedialogstring (bssourcemessage, bsxcmd, nil, nil, nil, bserrormessage); ! ! langerrormessage (bserrormessage); ! return (false); ! ! } /*callxcmdverb*/ ! ! #else #if !TARGET_RT_MAC_CFM --- 1371,1375 ---- ! #if MACVERSION && TARGET_API_MAC_OS8 #if !TARGET_RT_MAC_CFM *************** *** 1568,1572 **** #endif - #endif --- 1538,1541 ---- *************** *** 3165,3178 **** return ((*langcallbacks.msgverbcallback) (hparam1, v)); ! #if MACVERSION ! ! #if !TARGET_API_MAC_CARBON /*7.0b49: not implemented in OS X*/ ! case callxcmdfunc: return (callxcmdverb (hparam1, v)); - - #endif - #endif case callscriptfunc: return (callscriptverb (hparam1, v)); --- 3134,3142 ---- return ((*langcallbacks.msgverbcallback) (hparam1, v)); ! #if MACVERSION && TARGET_API_MAC_OS8 /*7.0b49: not implemented in OS X*/ case callxcmdfunc: return (callxcmdverb (hparam1, v)); #endif + case callscriptfunc: return (callscriptverb (hparam1, v)); Index: langscan.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langscan.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** langscan.c 23 Oct 2004 22:30:35 -0000 1.2 --- langscan.c 31 Oct 2004 18:48:51 -0000 1.3 *************** *** 460,464 **** long x; bigstring bstest; - boolean floverflow = false; if (flhex) { --- 460,463 ---- *************** *** 1331,1335 **** DebugStr ("\pyyoverflow"); ! } /*yyoverflow*/ #endif --- 1330,1336 ---- DebugStr ("\pyyoverflow"); ! } /%yyoverflow%/ ! */ ! #endif Index: langxml.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langxml.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** langxml.c 23 Oct 2004 22:34:12 -0000 1.2 --- langxml.c 31 Oct 2004 18:48:51 -0000 1.3 *************** *** 169,173 **** - static boolean handlebeginswith (Handle h, bigstring bs) { --- 169,172 ---- *************** *** 182,185 **** --- 181,186 ---- + #if 0 + static boolean handleendswith (Handle h, bigstring bs) { *************** *** 193,201 **** } /*handleendswith*/ static boolean handlecontains (Handle h, bigstring bs) { return (textpatternmatch (*h, gethandlesize (h), bs, false) >= 0); ! } /*handleendswith*/ --- 194,204 ---- } /*handleendswith*/ + #endif + static boolean handlecontains (Handle h, bigstring bs) { return (textpatternmatch (*h, gethandlesize (h), bs, false) >= 0); ! } /*handlecontains*/ *************** *** 305,308 **** --- 308,313 ---- + #if 0 + static boolean bettyRPCclient (bigstring server, short port, bigstring procedurename, hdltreenode hparams) { *************** *** 376,379 **** --- 381,385 ---- } /*bettyRPCclient*/ + #endif *************** *** 1095,1099 **** bigstring bsfunction; hdlhashtable hremotetable; - boolean fl = false; hdltreenode hcode; short port; --- 1101,1104 ---- *************** *** 1196,1201 **** return (true); ! } /*assignstringvalue*/ ! static boolean assigntokenstringvalue (hdlhashtable ht, const bigstring bs, xmltoken *value) { --- 1201,1206 ---- return (true); ! } /%assignstringvalue%/ ! */ static boolean assigntokenstringvalue (hdlhashtable ht, const bigstring bs, xmltoken *value) { *************** *** 1262,1268 **** ! /*static boolean skipblanks (Handle s) { ! /* on skipBlanks () { loop { --- 1267,1274 ---- ! /* ! static boolean skipblanks (Handle s) { ! /% on skipBlanks () { loop { *************** *** 1272,1276 **** break}; s = string.delete (s, 1, 1)}}; ! * / long ix, ct = gethandlesize (s); --- 1278,1282 ---- break}; s = string.delete (s, 1, 1)}}; ! %/ long ix, ct = gethandlesize (s); *************** *** 1280,1285 **** pullfromhandle (s, 0, ix, nil); ! } /*skipblanks*/ ! static boolean namenomad (xmladdress *nomad, bigstring name) { --- 1286,1291 ---- pullfromhandle (s, 0, ix, nil); ! } /%skipblanks%/ ! */ static boolean namenomad (xmladdress *nomad, bigstring name) { *************** *** 1535,1539 **** static boolean findinhandlestream (handlestream *s, bigstring bsfind, boolean flunicase) { - long startpos = (*s).pos; byte *p = *(*s).data; long ix; --- 1541,1544 ---- *************** *** 1942,1946 **** hdlhashtable nomadtable; hdlhashnode hnode; ! long ixsleep = 0; long lastsleeptickcount = gettickcount (); long ticksbetweensleeps = 60; /*one second*/ --- 1947,1951 ---- hdlhashtable nomadtable; hdlhashnode hnode; ! //long ixsleep = 0; long lastsleeptickcount = gettickcount (); long ticksbetweensleeps = 60; /*one second*/ *************** *** 2142,2146 **** long ctitems; ! /*if (!inmainthread () && !debuggingcurrentprocess ()) { /*PBS 7.1b14: give up some time to other threads periodically.*/ /* ixsleep++; --- 2147,2151 ---- long ctitems; ! //if (!inmainthread () && !debuggingcurrentprocess ()) { /*PBS 7.1b14: give up some time to other threads periodically.*/ /* ixsleep++; *************** *** 2151,2157 **** processsleep (getcurrentthread (), 0); ! } /*if*/ ! /* } /*if*/ ! // if nomad == adrtable if (nomad.ht == (*xmladr).ht && equalstrings (nomad.bs, (*xmladr).bs)) --- 2156,2163 ---- processsleep (getcurrentthread (), 0); ! } /%if%/ ! } /%if%/ ! */ ! // if nomad == adrtable if (nomad.ht == (*xmladr).ht && equalstrings (nomad.bs, (*xmladr).bs)) *************** *** 2173,2177 **** xmladdress adrsubitem; tyvaluerecord val; ! boolean flspecialname = false; bigstring namesubitem; tyvaluetype specialtype; --- 2179,2183 ---- xmladdress adrsubitem; tyvaluerecord val; ! //boolean flspecialname = false; bigstring namesubitem; tyvaluetype specialtype; Index: langwinipc.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langwinipc.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** langwinipc.c 23 Oct 2004 22:33:35 -0000 1.2 --- langwinipc.c 31 Oct 2004 18:48:51 -0000 1.3 *************** *** 67,72 **** - - boolean langwinipcerrorroutine (bigstring bs, ptrvoid refcon) { --- 67,70 ---- *************** *** 93,96 **** --- 91,96 ---- + #ifdef WIN95VERSION + static void langwinipchookerrors (langerrormessagecallback *savecallback) { *************** *** 119,123 **** - #ifdef WIN95VERSION static boolean langwinipccoerceparam (VARIANTARG * var, tyvaluerecord * val); --- 119,122 ---- *************** *** 1002,1006 **** hdlhashtable htable; tyvaluerecord vhandler; - Handle hthread = nil; hdlhashnode handlernode; --- 1001,1004 ---- Index: langsystypes.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langsystypes.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** langsystypes.c 23 Oct 2004 22:31:25 -0000 1.2 --- langsystypes.c 31 Oct 2004 18:48:51 -0000 1.3 *************** *** 224,228 **** ! static boolean getostypevalnamevisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, tyvaluerecord *vallookfor) { /* --- 224,228 ---- ! static boolean getostypevalnamevisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, ptrvoid refcon) { /* *************** *** 231,234 **** --- 231,235 ---- */ + tyvaluerecord *vallookfor = (tyvaluerecord *) refcon; register hdltablevariable hv; register hdlhashtable ht; *************** *** 366,370 **** /* ! hashgetvaluestring (*v, bsvalue); /*go with hex string%/ goto limit; --- 367,371 ---- /* ! hashgetvaluestring (*v, bsvalue); /%go with hex string%/ goto limit; *************** *** 1303,1308 **** static void setupdescriptor (Handle hdata, AEDesc *desc) { - register AEDesc *d = desc; - #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ --- 1304,1307 ---- *************** *** 1316,1319 **** --- 1315,1320 ---- #else + register AEDesc *d = desc; + (*d).dataHandle = hdata; *************** *** 3133,3137 **** op = (**h).nodetype; /*copy into register*/ ! /*langseterrorline (h); /*set globals for error reporting*/ switch (op) { --- 3134,3138 ---- op = (**h).nodetype; /*copy into register*/ ! //langseterrorline (h); /*set globals for error reporting*/ switch (op) { Index: langops.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langops.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** langops.c 23 Oct 2004 22:28:40 -0000 1.2 --- langops.c 31 Oct 2004 18:48:51 -0000 1.3 *************** *** 68,132 **** static tytypeinfo typeinfo [ctvaluetypes] = { ! '\?\?\?\?', STR_unknown, ! 'char', STR_char, ! 'shor', STR_int, ! 'long', STR_long, ! 'bad1', STR_unused1, /*8/13*/ ! 'data', STR_binary, ! 'bool', STR_boolean, ! 'tokn', STR_token, ! 'date', STR_date, ! 'addr', STR_address, ! 'code', STR_compiled_code, ! 'exte', STR_double, ! 'TEXT', STR_string, /*8/13*/ ! 'xtrn', STR_external, ! 'dir ', STR_direction, ! 'bad2', STR_unused2, /*9/17/91*/ ! 'type', STR_string4, ! 'bad3', STR_unused3, ! 'QDpt', STR_point, ! 'qdrt', STR_rect, ! 'tptn', STR_pattern, ! 'cRGB', STR_rgb, /*12/11/92 dmb*/ ! 'fixd', STR_fixed, ! 'sing', STR_single, ! 'doub', STR_double, ! 'obj ', STR_objspec, ! 'fss ', STR_filespec, ! 'alis', STR_alias, ! 'enum', STR_enumerator, ! 'list', STR_list, ! 'reco', STR_record, /* --- 68,132 ---- static tytypeinfo typeinfo [ctvaluetypes] = { ! {'\?\?\?\?', STR_unknown}, ! {'char', STR_char}, ! {'shor', STR_int}, ! {'long', STR_long}, ! {'bad1', STR_unused1}, /*8/13*/ ! {'data', STR_binary}, ! {'bool', STR_boolean}, ! {'tokn', STR_token}, ! {'date', STR_date}, ! {'addr', STR_address}, ! {'code', STR_compiled_code}, ! {'exte', STR_double}, ! {'TEXT', STR_string}, /*8/13*/ ! {'xtrn', STR_external}, ! {'dir ', STR_direction}, ! {'bad2', STR_unused2}, /*9/17/91*/ ! {'type', STR_string4}, ! {'bad3', STR_unused3}, ! {'QDpt', STR_point}, ! {'qdrt', STR_rect}, ! {'tptn', STR_pattern}, ! {'cRGB', STR_rgb}, /*12/11/92 dmb*/ ! {'fixd', STR_fixed}, ! {'sing', STR_single}, ! {'doub', STR_double}, ! {'obj ', STR_objspec}, ! {'fss ', STR_filespec}, ! {'alis', STR_alias}, ! {'enum', STR_enumerator}, ! {'list', STR_list}, ! {'reco', STR_record}, /* *************** *** 136,160 **** */ ! 'optx', STR_outline, ! 'wptx', STR_wptext, #ifdef fliowa ! 'intf', STR_interface, #else ! 'head', STR_headline, #endif ! 'tabl', STR_table, ! 'scpt', STR_script, ! 'mbar', STR_menubar, ! 'pict', STR_picture }; --- 136,160 ---- */ ! {'optx', STR_outline}, ! {'wptx', STR_wptext}, #ifdef fliowa ! {'intf', STR_interface}, #else ! {'head', STR_headline}, #endif ! {'tabl', STR_table}, ! {'scpt', STR_script}, ! {'mbar', STR_menubar}, ! {'pict', STR_picture} }; *************** *** 445,449 **** /*12/18/92 dmb ! if (*htable == nil) /*this is the innermost with value -- return to caller%/ *htable = hwith; */ --- 445,449 ---- /*12/18/92 dmb ! if (*htable == nil) /%this is the innermost with value -- return to caller%/ *htable = hwith; */ *************** *** 462,468 **** boolean langfindexternalwindow (const bigstring bs, Handle *hdata) { ! /* 7.21.97 dmb: see if the string specifies a standalong window that has data ! * / hdlwindowinfo hinfo; --- 462,468 ---- boolean langfindexternalwindow (const bigstring bs, Handle *hdata) { ! /% 7.21.97 dmb: see if the string specifies a standalong window that has data ! %/ hdlwindowinfo hinfo; *************** *** 475,479 **** return (false); ! } /*langfindexternalwindow*/ --- 475,480 ---- return (false); ! } /%langfindexternalwindow%/ ! */ Index: langvalue.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langvalue.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** langvalue.c 28 Oct 2004 23:08:32 -0000 1.3 --- langvalue.c 31 Oct 2004 18:48:51 -0000 1.4 *************** *** 437,452 **** /* ! setheapstring (emptystring, hstring); /*avoid recursion%/ ! disablelangerror (); /*we don't want to generate errors here%/ ! if (langexpandtodotparams (bs, htable, bs)) { /*valid path%/ ! setheapstring (bs, hstring); /*now we have just the name%/ ! enlargehandle ((Handle) hstring, sizeof (hdlhashtable), htable); /*should never fail%/ } else ! setheapstring (bs, hstring); /*restore original%/ enablelangerror (); --- 437,452 ---- /* ! setheapstring (emptystring, hstring); /%avoid recursion%/ ! disablelangerror (); /%we don't want to generate errors here%/ ! if (langexpandtodotparams (bs, htable, bs)) { /%valid path%/ ! setheapstring (bs, hstring); /%now we have just the name%/ ! enlargehandle ((Handle) hstring, sizeof (hdlhashtable), htable); /%should never fail%/ } else ! setheapstring (bs, hstring); /%restore original%/ enablelangerror (); *************** *** 493,497 **** // set the value with the new encoding ! h = (*val).data.addressvalue; if (!sethandlecontents (bs, stringsize (bs), h)) --- 493,497 ---- // set the value with the new encoding ! h = (Handle) (*val).data.addressvalue; if (!sethandlecontents (bs, stringsize (bs), h)) *************** *** 550,554 **** return (true); ! } /*setpasswordvalue*/ --- 550,555 ---- return (true); ! } /%setpasswordvalue%/ ! */ *************** *** 1040,1047 **** --- 1041,1055 ---- break; + + default: + /* do nothing */ + break; + } /*switch*/ } /*disposevaluerecord*/ + #if 0 + static boolean isgarbagetype (tyvaluetype type) { *************** *** 1065,1068 **** --- 1073,1078 ---- } /*isgarbagetype*/ + #endif + static void disposevalues (tyvaluerecord *val1, tyvaluerecord *val2) { *************** *** 1360,1386 **** return (setfixedvalue (FixRatio ((*val).data.longvalue, 1), val)); ! } /*stringtofixed*/ ! ! ! static boolean stringtosingle (tyvaluerecord *val) { ! ! if (!stringtolong (val)) ! return (false); ! ! return (setsinglevalue ((float) (*val).data.longvalue, val)); ! } /*stringtosingle*/ ! ! ! static boolean stringtodouble (tyvaluerecord *val) { ! ! double x; ! ! if (!stringtolong (val)) ! return (false); ! ! x = (float) (*val).data.longvalue; ! ! return (newheapvalue (&x, sizeof (x), doublevaluetype, val)); ! } /*stringtodouble*/ --- 1370,1375 ---- return (setfixedvalue (FixRatio ((*val).data.longvalue, 1), val)); ! } /%stringtofixed%/ ! */ *************** *** 1649,1653 **** *htable = internaltable; ! return (true); /*it is a special table%/ } */ --- 1638,1642 ---- *htable = internaltable; ! return (true); /%it is a special table%/ } */ *************** *** 3047,3051 **** --- 3036,3044 ---- if (equaltextidentifiers (stringbaseaddress(bs), stringbaseaddress(fileurl), stringlength(fileurl) )) { + + #ifdef WIN95VERSION short ix = 0; + #endif + /* Convert string to standard file string.*/ deletestring (bs, 1, stringlength (fileurl)); *************** *** 4639,4645 **** hdltreenode hparam = nil; - short ctskip = *ctpositional; tyvaluetype ptype = (*vreturned).valuetype; - boolean fllastparam = flnextparamislast; if (!getoptionalparam (hfirst, ctconsumed, ctpositional, bsparam, &hparam)) --- 4632,4636 ---- *************** *** 5242,5288 **** } /*getbinaryvalue*/ - /* - static boolean getbinarycopy (hdltreenode hfirst, short pnum, Handle *x) { - - /* - unlike getstringcopy in stringverbs.c, we leave the handle in the temp - stack; the caller should assume that the handle will be diposed on its own accord. - %/ - - tyvaluerecord v; - - if (!getparamvalue (hfirst, pnum, &v)) - return (false); - - if (!coercetobinary (&v)) - return (false); - - assert (exemptfromtmpstack (v) && pushvalueontmpstack (v)); /*there are no binary literals in the language%/ - - *x = v.data.binaryvalue; - - return (true); - } /*getbinarycopy%/ - - - boolean xgetbinaryvalue (hdltreenode hfirst, short pnum, boolean flreadonly, Handle *x) { - - /* - new version of getbinaryvalue; gets it like any other normal data type. - %/ - - tyvaluerecord val; - - if (!flreadonly) - return (getbinarycopy (hfirst, pnum, x)); - - if (!getbinaryparam (hfirst, pnum, &val)) - return (false); - - *x = val.data.binaryvalue; - - return (true); - } /*xgetbinaryvalue*/ - boolean langsetbooleanvarparam (hdltreenode hfirst, short pnum, boolean fl) { --- 5233,5236 ---- *************** *** 5331,5335 **** ! static int ctlazythis = 0; boolean idvalue (hdltreenode htree, tyvaluerecord *val) { --- 5279,5285 ---- ! #if lazythis_optimization ! static int ctlazythis = 0; ! #endif boolean idvalue (hdltreenode htree, tyvaluerecord *val) { *************** *** 5673,5678 **** tyvaluerecord varray; tyvaluerecord vindex; ! register short top; ! boolean flarrayistable = false; boolean fltmp; boolean fl; --- 5623,5627 ---- tyvaluerecord varray; tyvaluerecord vindex; ! register short top = 0; boolean fltmp; boolean fl; *************** *** 5865,5869 **** tyvaluerecord velement; tyarraystack arraystack = {0}; - register hdltreenode harray = (**h).param1; hdlhashtable htable; bigstring bsname; --- 5814,5817 ---- *************** *** 7181,7195 **** h2 = (*v2).data.stringvalue; ! switch (op) { ! ! case beginswithop: ! ixlimit = gethandlesize (h2); ! ! break; ! ! case endswithop: ! ixstart = gethandlesize (h1) - gethandlesize (h2); ! ! break; } --- 7129,7137 ---- h2 = (*v2).data.stringvalue; ! if (op == beginswithop) { ! ixlimit = gethandlesize (h2); ! } ! else if (op == endswithop) { ! ixstart = gethandlesize (h1) - gethandlesize (h2); } *************** *** 7364,7369 **** */ - register boolean fl = true; - if (!coercetoboolean (&v1)) return (false); --- 7306,7309 ---- *************** *** 7371,7433 **** return (setbooleanvalue (!v1.data.flvalue, vreturned)); } /*notvalue*/ ! ! /* ! notvalue (tyvaluerecord v1, tyvaluerecord *vreturned) { ! ! register boolean fl = true; ! ! initvalue (vreturned, v1.valuetype); ! ! switch (v1.valuetype) { ! ! case booleanvaluetype: ! (*vreturned).data.flvalue = !v1.data.flvalue; ! ! break; ! ! case charvaluetype: ! (*vreturned).data.chvalue = !v1.data.chvalue; ! ! break; ! ! case intvaluetype: ! (*vreturned).data.intvalue = !v1.data.intvalue; ! ! break; ! ! case longvaluetype: ! case fixedvaluetype: ! (*vreturned).data.longvalue = !v1.data.longvalue; ! ! break; ! ! case datevaluetype: ! (*vreturned).data.datevalue = !v1.data.datevalue; ! ! break; ! ! case singlevaluetype: ! (*vreturned).data.singlevalue = !v1.data.singlevalue; ! ! break; ! ! case doublevaluetype: ! fl = setdoublevalue (!**v1.data.doublevalue, vreturned); ! ! break; ! ! default: ! langerror (unarynotnotpossibleerror); ! ! fl = false; /*negation is not defined%/ ! ! break; ! } /*switch%/ ! ! disposevalues (&v1, nil); ! ! return (fl); ! } /*notvalue*/ ! static boolean sizefunc (hdltreenode hparam1, tyvaluerecord *vreturned) { --- 7311,7315 ---- return (setbooleanvalue (!v1.data.flvalue, vreturned)); } /*notvalue*/ ! static boolean sizefunc (hdltreenode hparam1, tyvaluerecord *vreturned) { *************** *** 8420,8424 **** ! /* boolean langgetlocalhandlercode (bigstring bs, hdltreenode *hcode) { --- 8302,8307 ---- ! #if 0 ! boolean langgetlocalhandlercode (bigstring bs, hdltreenode *hcode) { *************** *** 8426,8433 **** tyvaluerecord val; ! if (!langgetsymbolval (bs, &val)) /*not found in local chain%/ return (false); ! if (val.valuetype != codevaluetype) /*not a local handler%/ return (false); --- 8309,8316 ---- tyvaluerecord val; ! if (!langgetsymbolval (bs, &val)) /*not found in local chain*/ return (false); ! if (val.valuetype != codevaluetype) /*not a local handler*/ return (false); *************** *** 8437,8440 **** --- 8320,8325 ---- } /*langgetlocalhandlercode*/ + #endif + boolean langgetnodecode (hdlhashtable ht, bigstring bs, hdlhashnode hnode, hdltreenode *hcode) { *************** *** 8869,8872 **** --- 8754,8762 ---- #endif + + default: + /* do nothing */ + break; + } /*switch*/ Index: langstartup.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langstartup.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** langstartup.c 23 Oct 2004 22:30:48 -0000 1.2 --- langstartup.c 31 Oct 2004 18:48:51 -0000 1.3 *************** *** 112,116 **** ! static boolean langaddkeyword (bigstring bs, short tokennumber) { tyvaluerecord val; --- 112,116 ---- ! boolean langaddkeyword (bigstring bs, short tokennumber) { tyvaluerecord val; *************** *** 137,142 **** return (fl); ! } /*langaddkeywordlist*/ ! boolean loadfunctionprocessor (short id, langvaluecallback valuecallback) { --- 137,142 ---- return (fl); ! } /%langaddkeywordlist%/ ! */ boolean loadfunctionprocessor (short id, langvaluecallback valuecallback) { *************** *** 416,419 **** --- 416,421 ---- + #if 0 + static boolean langaddintconst (bigstring bs, short x) { *************** *** 424,427 **** --- 426,431 ---- return (hashinsertcstring (bs, &val)); } /*langaddintconst*/ + + #endif *************** *** 443,447 **** return (hashinsert (bs, val)); ! } /*langaddintconst*/ --- 447,451 ---- return (hashinsert (bs, val)); ! } /*langaddbooleanconst*/ Index: langpack.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langpack.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** langpack.c 23 Oct 2004 22:29:00 -0000 1.2 --- langpack.c 31 Oct 2004 18:48:51 -0000 1.3 *************** *** 111,115 **** /* ! copystring (signaturestring, header.sigbytes); /*prevents crashes on bad data%/ header.valuetype = val.valuetype; --- 111,115 ---- /* ! copystring (signaturestring, header.sigbytes); /%prevents crashes on bad data%/ header.valuetype = val.valuetype; Index: langtree.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langtree.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** langtree.c 28 Oct 2004 23:08:10 -0000 1.3 --- langtree.c 31 Oct 2004 18:48:51 -0000 1.4 *************** *** 316,320 **** ! static boolean counttreenodevisit (hdltreenode hnode, short *ctnodes) { ++*ctnodes; --- 316,322 ---- ! static boolean counttreenodevisit (hdltreenode hnode, ptrvoid refcon) { ! ! short *ctnodes = (short *) refcon; ++*ctnodes; *************** *** 669,672 **** --- 671,678 ---- break; + + default: + /* do nothing */ + break; } } *************** *** 805,809 **** /* ! if ((**h).nodeval.valuetype != stringvaluetype) /*skip optimization%/ goto L1; */ --- 811,815 ---- /* ! if ((**h).nodeval.valuetype != stringvaluetype) /%skip optimization%/ goto L1; */ *************** *** 1010,1014 **** ! static boolean langpacktreevisit (hdltreenode htree, ptrpacktreeinfo pi) { /* --- 1016,1020 ---- ! static boolean langpacktreevisit (hdltreenode htree, ptrvoid refcon) { /* *************** *** 1018,1021 **** --- 1024,1028 ---- register hdltreenode hn = htree; + ptrpacktreeinfo pi = (ptrpacktreeinfo) refcon; register ptrdisktreenode pn; tyvaluerecord val = (**hn).nodeval; |
