Menu
▾
▴
[frontierkernel-commits] Frontier/Common/source opxml.c,1.2,1.3 shellwindowverbs.c,1.2,1.3 opverbs.c,1.2,1.3 langipc.c,1.3,1.4 shellverbs.c,1.2,1.3 langvalue.c,1.4,1.5 langexternal.c,1.2,1.3 langhash.c,1.2,1.3
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28537 Modified Files: opxml.c shellwindowverbs.c opverbs.c langipc.c shellverbs.c langvalue.c langexternal.c langhash.c Log Message: Fixed GCC compiler warnings. Index: langexternal.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langexternal.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** langexternal.c 23 Oct 2004 22:25:08 -0000 1.2 --- langexternal.c 31 Oct 2004 21:43:38 -0000 1.3 *************** *** 82,86 **** return (dbrefhandle ((dbaddress) (**hv).variabledata, h)); ! } /*langexternalload%/ --- 82,86 ---- return (dbrefhandle ((dbaddress) (**hv).variabledata, h)); ! } /%langexternalload%/ *************** *** 107,112 **** return (dbassignhandle (h, adr)); ! } /*langexternalsave*/ ! tyexternalid langexternalgettype (tyvaluerecord val) { --- 107,112 ---- return (dbassignhandle (h, adr)); ! } /%langexternalsave%/ ! */ tyexternalid langexternalgettype (tyvaluerecord val) { *************** *** 223,227 **** boolean langexternalarrayreference (bigstring bsarrayname, short ix, tyvaluerecord *valref) { ! /* we want to isolate the interpreter from understanding how arrays are stored. that's why this routine is part of the "external" interface of the language. --- 223,227 ---- boolean langexternalarrayreference (bigstring bsarrayname, short ix, tyvaluerecord *valref) { ! /% we want to isolate the interpreter from understanding how arrays are stored. that's why this routine is part of the "external" interface of the language. *************** *** 269,275 **** return (false); ! h = hnew; /*copy into register%/ ! pushtmpstack ((Handle) h); /*we just allocated a temporary value%/ (**h).id = idheadrecord; --- 269,275 ---- return (false); ! h = hnew; /%copy into register%/ ! pushtmpstack ((Handle) h); /%we just allocated a temporary value%/ (**h).id = idheadrecord; *************** *** 280,284 **** return (true); ! } /*langexternalarrayreference%/ */ --- 280,284 ---- return (true); ! } /%langexternalarrayreference%/ */ *************** *** 596,600 **** static boolean closeregisteredwindowvisit (hdlhashnode hnode, ptrvoid refcon) { ! boolean flconfirm = (boolean) refcon; hdlwindowinfo hinfo; --- 596,600 ---- static boolean closeregisteredwindowvisit (hdlhashnode hnode, ptrvoid refcon) { ! boolean flconfirm = (refcon != nil); hdlwindowinfo hinfo; *************** *** 613,617 **** */ ! return (hashtablevisit (filewindowtable, &closeregisteredwindowvisit, (ptrvoid) flconfirm)); } /*langexternalcloseregisteredwindows*/ --- 613,617 ---- */ ! return (hashtablevisit (filewindowtable, &closeregisteredwindowvisit, (ptrvoid) ((long) flconfirm))); } /*langexternalcloseregisteredwindows*/ *************** *** 1082,1086 **** boolean langexternalcoercetostring (tyvaluerecord *v) { ! /* assume the valuerecord is of type externalvaluetype. --- 1082,1086 ---- boolean langexternalcoercetostring (tyvaluerecord *v) { ! /% assume the valuerecord is of type externalvaluetype. *************** *** 1105,1112 **** return (false); ! } /*switch%/ return (false); ! } /*langexternalcoercetostring*/ --- 1105,1113 ---- return (false); ! } /%switch%/ return (false); ! } /%langexternalcoercetostring%/ ! */ *************** *** 1153,1160 **** nomad = (**nomad).prevhashtable; ! } /*while%/ ! ! /*ran out of tables to look at%/ */ --- 1154,1160 ---- nomad = (**nomad).prevhashtable; ! } /%while%/ + /%ran out of tables to look at%/ */ *************** *** 1254,1258 **** register boolean fltempload; hdlhashnode x; ! register hdlexternalvariable hv; bigstring bs; hdlwindowinfo hinfo; --- 1254,1258 ---- register boolean fltempload; hdlhashnode x; ! register hdlexternalvariable hv = nil; bigstring bs; hdlwindowinfo hinfo; *************** *** 1483,1487 **** register long i; tyvaluerecord val; ! register hdlexternalvariable hv; extern boolean tablesetdebugglobals (hdlhashtable, hdlhashnode); long bucketCount; --- 1483,1487 ---- register long i; tyvaluerecord val; ! register hdlexternalvariable hv = nil; extern boolean tablesetdebugglobals (hdlhashtable, hdlhashnode); long bucketCount; Index: langipc.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langipc.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** langipc.c 31 Oct 2004 19:08:17 -0000 1.3 --- langipc.c 31 Oct 2004 21:43:38 -0000 1.4 *************** *** 124,128 **** static hdlverbrecord hipcverb = nil; /*the verb currently being handled*/ - static boolean flipcthreadwaiting = false; //Code change by Timothy Paustian Wednesday, June 14, 2000 8:59:44 PM //Changed to Opaque call for Carbon --- 124,127 ---- *************** *** 185,189 **** static void langipchookerrors (hdlverbrecord hverb, callback *savecallback) { ! *savecallback = langcallbacks.errormessagecallback; langcallbacks.errormessagecallback = &langipcerrorroutine; --- 184,188 ---- static void langipchookerrors (hdlverbrecord hverb, callback *savecallback) { ! *savecallback = (callback) langcallbacks.errormessagecallback; langcallbacks.errormessagecallback = &langipcerrorroutine; *************** *** 199,203 **** shellpoperrorhook (); ! langcallbacks.errormessagecallback = savecallback; fllangerror = false; /*make sure error flag is cleared*/ --- 198,202 ---- shellpoperrorhook (); ! langcallbacks.errormessagecallback = (errorhookcallback) savecallback; fllangerror = false; /*make sure error flag is cleared*/ *************** *** 425,429 **** register AEDesc *p = param; ! register desctype = (*p).descriptorType; register tyvaluerecord *v = vreturned; Handle hdata; --- 424,428 ---- register AEDesc *p = param; ! register DescType desctype = (*p).descriptorType; register tyvaluerecord *v = vreturned; Handle hdata; *************** *** 848,852 **** hdltreenode hcode; register boolean fl = false; - Handle hthread = nil; if (!langipcfileopen (hverb)) --- 847,850 ---- *************** *** 1275,1279 **** if (iachandlertable != nil) hashtableassign (iachandlertable, "\ptrapTransaction", val); ! } /*setglobaltransactionid*/ #if TARGET_API_MAC_CARBON == 0 --- 1273,1278 ---- if (iachandlertable != nil) hashtableassign (iachandlertable, "\ptrapTransaction", val); ! } /%setglobaltransactionid%/ ! */ #if TARGET_API_MAC_CARBON == 0 *************** *** 1344,1348 **** tyvaluerecord vhandler; tyvaluerecord osacode; ! Handle hthread = nil; hdlhashnode handlernode; AppleEvent event, reply; --- 1343,1347 ---- tyvaluerecord vhandler; tyvaluerecord osacode; ! //Handle hthread = nil; hdlhashnode handlernode; AppleEvent event, reply; *************** *** 1510,1513 **** --- 1509,1514 ---- + #if TARGET_API_MAC_OS8 + static boolean langipcgetmenuarrayverb (hdlverbrecord hverb) { *************** *** 1619,1622 **** --- 1620,1625 ---- } /*langipckillscriptverb*/ + #endif + static pascal boolean langipchandleverb (hdlverbrecord hverb) { *************** *** 1703,1707 **** #ifndef PIKE ! #if TARGET_API_MAC_CARBON == 0 case getmenuarraytoken: fl = langipcgetmenuarrayverb (hverb); --- 1706,1710 ---- #ifndef PIKE ! #if TARGET_API_MAC_OS8 case getmenuarraytoken: fl = langipcgetmenuarrayverb (hverb); *************** *** 1723,1727 **** break; ! #endif #endif --- 1726,1730 ---- break; ! #endif #endif *************** *** 2030,2036 **** boolean langipcgetaddressvalue (hdltreenode hparam1, tyvaluerecord *vreturned) { - register hdltreenode hp1 = hparam1; - register tyvaluerecord *v = vreturned; - return (setbooleanvalue (false, vreturned)); } /*langipcgetaddressvalue*/ --- 2033,2036 ---- *************** *** 2236,2240 **** ! static stealbinaryhandle (tyvaluerecord *val, Handle *x) { if (exemptfromtmpstack (val)) { --- 2236,2240 ---- ! static boolean stealbinaryhandle (tyvaluerecord *val, Handle *x) { if (exemptfromtmpstack (val)) { *************** *** 2503,2507 **** valuetype = langgetvaluetype (itemdesc.descriptorType); ! if (langgoodbinarytype (valuetype)) { /*unpackable%/ if (!coercevalue (&itemval, valuetype)) --- 2503,2507 ---- valuetype = langgetvaluetype (itemdesc.descriptorType); ! if (langgoodbinarytype (valuetype)) { /%unpackable%/ if (!coercevalue (&itemval, valuetype)) *************** *** 2700,2708 **** return (true); ! } /*langipcapprunning*/ ! ! static boolean langipcgetparamvisit (bigstring bs, hdlhashnode hnode, tyvaluerecord val, hdlverbrecord hv) { OSType key; --- 2700,2709 ---- return (true); ! } /%langipcapprunning%/ ! */ ! static boolean langipcgetparamvisit (bigstring bs, hdlhashnode hnode, tyvaluerecord val, ptrvoid refcon) { + hdlverbrecord hv = (hdlverbrecord) refcon; OSType key; *************** *** 2977,2981 **** ! static boolean apptablevisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, tyappvisitinfo *appvisitinfo) { /* --- 2978,2982 ---- ! static boolean apptablevisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, ptrvoid refcon) { /* *************** *** 2984,2987 **** --- 2985,2989 ---- */ + tyappvisitinfo *appvisitinfo = (tyappvisitinfo*) refcon; register hdltablevariable hv; register hdlhashtable ht; *************** *** 3397,3401 **** static void langipchookfasterrors (AEDesc *reply) { ! fastsavecallback = langcallbacks.errormessagecallback; langcallbacks.errormessagecallback = &langipcfasterror; --- 3399,3403 ---- static void langipchookfasterrors (AEDesc *reply) { ! fastsavecallback = (callback) langcallbacks.errormessagecallback; langcallbacks.errormessagecallback = &langipcfasterror; *************** *** 3411,3415 **** shellpoperrorhook (); ! langcallbacks.errormessagecallback = fastsavecallback; oserror (noErr); /*clear it out to avoid conflicts with current thread*/ --- 3413,3417 ---- shellpoperrorhook (); ! langcallbacks.errormessagecallback = (errorhookcallback) fastsavecallback; oserror (noErr); /*clear it out to avoid conflicts with current thread*/ *************** *** 3673,3677 **** static boolean handlekernelfunction (hdlverbrecord hverb) { ! /* 2.1b14: this is what langipchandletrapverb boils down to in its handling of the kernel event. but to avoid all this code --- 3675,3679 ---- static boolean handlekernelfunction (hdlverbrecord hverb) { ! /% 2.1b14: this is what langipchandletrapverb boils down to in its handling of the kernel event. but to avoid all this code *************** *** 3700,3704 **** return (false); ! /*build a code tree and call the handler, with our error hook in place%/ langipchookerrors (hv, &savecallback); --- 3702,3706 ---- return (false); ! /%build a code tree and call the handler, with our error hook in place%/ langipchookerrors (hv, &savecallback); *************** *** 3710,3714 **** goto exit; ! pushhashtable (hcontext); /*need context to evaluate local address params%/ fl = langipcbuildparamlist (hv, &hparamlist); --- 3712,3716 ---- goto exit; ! pushhashtable (hcontext); /%need context to evaluate local address params%/ fl = langipcbuildparamlist (hv, &hparamlist); *************** *** 3723,3730 **** } ! if (!pushfunctioncall (hfunctioncall, hparamlist, &hcode)) /*consumes input parameters%/ goto exit; ! if (!pushbinaryoperation (moduleop, hcode, nil, &hcode)) /*needs this level%/ goto exit; --- 3725,3732 ---- } ! if (!pushfunctioncall (hfunctioncall, hparamlist, &hcode)) /%consumes input parameters%/ goto exit; ! if (!pushbinaryoperation (moduleop, hcode, nil, &hcode)) /%needs this level%/ goto exit; *************** *** 3736,3741 **** return (fl); ! } /*handlekernelfunction*/ ! boolean langipckernelfunction (hdlhashtable htable, bigstring bsverb, hdltreenode hparam1, tyvaluerecord *vreturned) { --- 3738,3743 ---- return (fl); ! } /%handlekernelfunction%/ ! */ boolean langipckernelfunction (hdlhashtable htable, bigstring bsverb, hdltreenode hparam1, tyvaluerecord *vreturned) { *************** *** 4091,4095 **** /* ! shellpushblock (highLevelEventMask, true); /*just in case%/ fl = langbackgroundtask (); --- 4093,4097 ---- /* ! shellpushblock (highLevelEventMask, true); /%just in case%/ fl = langbackgroundtask (); *************** *** 4293,4297 **** Boolean fl; ! #if flcomponent long curA5 = SetUpAppA5 (); --- 4295,4299 ---- Boolean fl; ! #if flcomponent && TARGET_API_MAC_OS8 long curA5 = SetUpAppA5 (); *************** *** 4349,4353 **** landpopfastcontext (&savecontext); ! #if flcomponent RestoreA5 (curA5); --- 4351,4355 ---- landpopfastcontext (&savecontext); ! #if flcomponent && TARGET_API_MAC_OS8 RestoreA5 (curA5); *************** *** 4376,4380 **** OSErr err; ! #if flcomponent long curA5 = SetUpThisA5 (refcon); --- 4378,4382 ---- OSErr err; ! #if flcomponent && TARGET_API_MAC_OS8 long curA5 = SetUpThisA5 (refcon); *************** *** 4466,4470 **** #endif ! #if flcomponent RestoreA5 (curA5); --- 4468,4472 ---- #endif ! #if flcomponent && TARGET_API_MAC_OS8 RestoreA5 (curA5); Index: opverbs.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/opverbs.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** opverbs.c 23 Oct 2004 22:45:16 -0000 1.2 --- opverbs.c 31 Oct 2004 21:43:38 -0000 1.3 *************** *** 466,472 **** static void opverbsetcallbacks (hdloutlinevariable hvariable, hdloutlinerecord houtline) { register hdloutlinerecord ho = houtline; - /* (**ho).setscrollbarsroutine = &opverbsetscrollbarsroutine; // 1/31/97 dmb: default is ok now */ --- 466,472 ---- static void opverbsetcallbacks (hdloutlinevariable hvariable, hdloutlinerecord houtline) { + /* register hdloutlinerecord ho = houtline; (**ho).setscrollbarsroutine = &opverbsetscrollbarsroutine; // 1/31/97 dmb: default is ok now */ *************** *** 1456,1460 **** bigstring bs; ! setbooleanvalue (false, v); /*assume the worst%/ flnextparamislast = true; --- 1456,1460 ---- bigstring bs; ! setbooleanvalue (false, v); /%assume the worst%/ flnextparamislast = true; *************** *** 1467,1471 **** return (langrun (htext, v)); ! } /*oprunverb*/ --- 1467,1472 ---- return (langrun (htext, v)); ! } /%oprunverb%/ ! */ *************** *** 1595,1601 **** ! static boolean opcommentvisit (hdlheadrecord hnode, ptrbitinfo bitinfo) { hdlheadrecord h = hnode; if ((**h).flcomment != (*bitinfo).flset) { /*changing*/ --- 1596,1603 ---- ! static boolean opcommentvisit (hdlheadrecord hnode, ptrvoid refcon) { hdlheadrecord h = hnode; + ptrbitinfo bitinfo = (ptrbitinfo) refcon; if ((**h).flcomment != (*bitinfo).flset) { /*changing*/ *************** *** 1625,1630 **** ! static boolean opbreakpointvisit (hdlheadrecord hnode, ptrbitinfo bitinfo) { hdlheadrecord h = hnode; --- 1627,1633 ---- ! static boolean opbreakpointvisit (hdlheadrecord hnode, ptrvoid refcon) { + ptrbitinfo bitinfo = (ptrbitinfo) refcon; hdlheadrecord h = hnode; *************** *** 1658,1662 **** static boolean opmarkedverb (boolean fl) { ! /* change the marked state of the cursor line. only update if it actually changed. fl == true means set a mark. --- 1661,1665 ---- static boolean opmarkedverb (boolean fl) { ! /% change the marked state of the cursor line. only update if it actually changed. fl == true means set a mark. *************** *** 1665,1673 **** hdlheadrecord hcursor; ! fl = bitboolean (fl); /*make sure it's a 1 or a 0%/ hcursor = (**outlinedata).hbarcursor; ! if ((**hcursor).flmarked == fl) /*not changing%/ return (false); --- 1668,1676 ---- hdlheadrecord hcursor; ! fl = bitboolean (fl); /%make sure it's a 1 or a 0%/ hcursor = (**outlinedata).hbarcursor; ! if ((**hcursor).flmarked == fl) /%not changing%/ return (false); *************** *** 1681,1686 **** return (true); ! } /*opmarkedverb*/ ! static boolean opsetdisplayverb (boolean fldisplay) { --- 1684,1689 ---- return (true); ! } /%opmarkedverb%/ ! */ static boolean opsetdisplayverb (boolean fldisplay) { *************** *** 2175,2179 **** flnextparamislast = true; ! if (!getvarparam (hparam1, 1, &htable, bs)) /*returned handle holder%/ return (false); */ --- 2178,2182 ---- flnextparamislast = true; ! if (!getvarparam (hparam1, 1, &htable, bs)) /%returned handle holder%/ return (false); */ *************** *** 2210,2214 **** /* ! if (!langsetsymboltableval (htable, bs, linkedval)) /*probably a memory error%/ return (false); --- 2213,2217 ---- /* ! if (!langsetsymboltableval (htable, bs, linkedval)) /%probably a memory error%/ return (false); *************** *** 2574,2578 **** register hdloutlinerecord ho = outlinedata; register hdlheadrecord nomad; - register long ctheadlines = 1; assert ((ho != nil) && (*ho != nil)); --- 2577,2580 ---- *************** *** 2599,2603 **** ! static boolean opgetselvisit (hdlheadrecord hnode, hdllistrecord hlist) { /* --- 2601,2605 ---- ! static boolean opgetselvisit (hdlheadrecord hnode, ptrvoid refcon) { /* *************** *** 2609,2612 **** --- 2611,2615 ---- */ + hdllistrecord hlist = (hdllistrecord) refcon; tyvaluerecord val; *************** *** 2883,2887 **** ! static boolean opgetselectedsuboutlinesvisit (hdlheadrecord hnode, hdloutlinerecord ho) { /* --- 2886,2890 ---- ! static boolean opgetselectedsuboutlinesvisit (hdlheadrecord hnode, ptrvoid refcon) { /* *************** *** 2889,2892 **** --- 2892,2896 ---- */ + hdloutlinerecord ho = (hdloutlinerecord) refcon; hdlheadrecord hcopy; hdlheadrecord hbarcursor = (**ho).hbarcursor; *************** *** 3005,3009 **** tyvaluerecord val; hdlhashnode hnode; ! boolean fl = false, flhadtarget = false; Handle htext; boolean flnewoutline; --- 3009,3013 ---- tyvaluerecord val; hdlhashnode hnode; ! boolean fl = false; Handle htext; boolean flnewoutline; *************** *** 4433,4437 **** (*cb).titleclickroutine = &opverbtitleclick; ! (*cb).getvariableroutine = &opverbgetvariable; (*cb).settextmoderoutine = &opsettextmode; --- 4437,4441 ---- (*cb).titleclickroutine = &opverbtitleclick; ! (*cb).getvariableroutine = (shellgetvariablecallback) &opverbgetvariable; (*cb).settextmoderoutine = &opsettextmode; Index: langvalue.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langvalue.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** langvalue.c 31 Oct 2004 18:48:51 -0000 1.4 --- langvalue.c 31 Oct 2004 21:43:38 -0000 1.5 *************** *** 5264,5267 **** --- 5264,5282 ---- + boolean langsetstringvarparam (hdltreenode hfirst, short pnum, bigstring bsset) { + + hdlhashtable htable; + bigstring bsname; + tyvaluerecord val; + + if (!getvarparam (hfirst, pnum, &htable, bsname)) + return (false); + + setstringvalue (bsset, &val); + + return (hashtableassign (htable, bsname, val)); + } /*langsetstringvarparam*/ + + boolean setintvarparam (hdltreenode hfirst, short pnum, short n) { Index: opxml.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/opxml.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** opxml.c 23 Oct 2004 22:45:51 -0000 1.2 --- opxml.c 31 Oct 2004 21:43:38 -0000 1.3 *************** *** 1251,1255 **** bigstring bs; - boolean fl = false; short ix = 1; --- 1251,1254 ---- *************** *** 1484,1490 **** return (false); ! /* if (!shellmovewindow (hinfo, windowleft, windowtop)) /*Set window position*/ ! /* return (false); /*shellmovewindow always returns true at this writing, but that could change*/ ! if (!shellmovewindowhidden (hinfo, windowleft, windowtop)) /*Set window position*/ --- 1483,1488 ---- return (false); ! // if (!shellmovewindow (hinfo, windowleft, windowtop)) /*Set window position*/ ! // return (false); /*shellmovewindow always returns true at this writing, but that could change*/ if (!shellmovewindowhidden (hinfo, windowleft, windowtop)) /*Set window position*/ *************** *** 1877,1881 **** hdlheadrecord hbarcursor; boolean fl = false; - boolean fldummy = false; /*Get the /atts table.*/ --- 1875,1878 ---- Index: shellwindowverbs.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellwindowverbs.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** shellwindowverbs.c 23 Oct 2004 22:57:39 -0000 1.2 --- shellwindowverbs.c 31 Oct 2004 21:43:38 -0000 1.3 *************** *** 31,34 **** --- 31,36 ---- #endif + #include "shell.h" + #include "shellprivate.h" #include "about.h" #include "file.h" *************** *** 38,43 **** #include "db.h" #include "command.h" - #include "shell.h" - #include "shellprivate.h" #include "lang.h" #include "langexternal.h" --- 40,43 ---- *************** *** 588,592 **** */ - register boolean fl = false; hdlwindowinfo hinfo; WindowPtr pnext; --- 588,591 ---- *************** *** 745,752 **** boolean fl; ! if (!langcheckparamcount (hparam1, 0)) /*shouldn't have any parameters%/ return (false); ! fl = false; /*default return is false%/ if (shellfindtargetwindow (-1, &target)) { --- 744,751 ---- boolean fl; ! if (!langcheckparamcount (hparam1, 0)) /%shouldn't have any parameters%/ return (false); ! fl = false; /%default return is false%/ if (shellfindtargetwindow (-1, &target)) { *************** *** 1039,1043 **** hdlwindowinfo hinfo; tyfilespec fs; - boolean fl = false; flnextparamislast = true; --- 1038,1041 ---- Index: shellverbs.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellverbs.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** shellverbs.c 23 Oct 2004 22:56:47 -0000 1.2 --- shellverbs.c 31 Oct 2004 21:43:38 -0000 1.3 *************** *** 241,245 **** }; ! static enum nameindexes { ixsearchfor, --- 241,245 ---- }; ! enum nameindexes { ixsearchfor, *************** *** 260,265 **** ixregularexpression ! } nameindexes; ! static void shellverbsetselectioninfo () { --- 260,264 ---- ixregularexpression ! }; static void shellverbsetselectioninfo () { *************** *** 320,353 **** - static boolean langsetbooleanvarparam (hdltreenode hfirst, short pnum, boolean flset) { - - hdlhashtable htable; - bigstring bsname; - tyvaluerecord val; - - if (!getvarparam (hfirst, pnum, &htable, bsname)) - return (false); - - setbooleanvalue (flset, &val); - - return (hashtableassign (htable, bsname, val)); - } /*langsetbooleanvarparam*/ - - - static boolean langsetstringvarparam (hdltreenode hfirst, short pnum, bigstring bsset) { - - hdlhashtable htable; - bigstring bsname; - tyvaluerecord val; - - if (!getvarparam (hfirst, pnum, &htable, bsname)) - return (false); - - setstringvalue (bsset, &val); - - return (hashtableassign (htable, bsname, val)); - } /*langsetstringvarparam*/ - - static boolean getstringsearchparam (short ixparam, bigstring bsvalue) { --- 319,322 ---- *************** *** 741,745 **** keyboardclearescape (); /*consume it*/ ! /*break; /*we'll return false to halt script execution*/ } --- 710,714 ---- keyboardclearescape (); /*consume it*/ ! //break; /*we'll return false to halt script execution*/ } *************** *** 782,786 **** keyboardclearescape (); /*consume it*/ ! /*break; /*we'll return false to halt script execution*/ } --- 751,755 ---- keyboardclearescape (); /*consume it*/ ! //break; /*we'll return false to halt script execution*/ } *************** *** 1121,1125 **** tyfilespec fs; tyexternalid id; - boolean flhidden = false; tyvaluerecord vhidden; short ctconsumed = 0; --- 1090,1093 ---- Index: langhash.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langhash.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** langhash.c 23 Oct 2004 22:25:24 -0000 1.2 --- langhash.c 31 Oct 2004 21:43:38 -0000 1.3 *************** *** 378,382 **** getaddresspath ((**hn).val, bspath); ! sethandlecontents (bspath, stringsize (bspath), (**hn).val.data.addressvalue); #if fldebug --- 378,382 ---- getaddresspath ((**hn).val, bspath); ! sethandlecontents (bspath, stringsize (bspath), (Handle) (**hn).val.data.addressvalue); #if fldebug *************** *** 508,511 **** --- 508,513 ---- + #if 0 + static boolean indexhashtable_obsolete (short tablenum, hdlhashtable *htable) { *************** *** 541,544 **** --- 543,548 ---- return (true); } /*indexhashtable*/ + + #endif *************** *** 977,985 **** nomad = (**ht).hashbucket [i]; ! (**ht).hashbucket [i] = nil; /*disconnect list so table is valid during disposal%/ while (nomad != nil) { ! /* boolean fldisposevalue; --- 981,989 ---- nomad = (**ht).hashbucket [i]; ! (**ht).hashbucket [i] = nil; /%disconnect list so table is valid during disposal%/ while (nomad != nil) { ! /% boolean fldisposevalue; *************** *** 989,993 **** nextnomad = (**nomad).hashlink; ! disposehashnode (nomad, true /*fldisposevalue%/, fldisk); nomad = nextnomad; --- 993,997 ---- nextnomad = (**nomad).hashlink; ! disposehashnode (nomad, true /%fldisposevalue%/, fldisk); nomad = nextnomad; *************** *** 1284,1288 **** hashmerge (hdlhashtable hsource, hdlhashtable hdest) { ! /* merge hsource into hdest, leaving hsource empty. since it consumes no memory (we just unlink nodes and deposit them) it can't fail. --- 1288,1292 ---- hashmerge (hdlhashtable hsource, hdlhashtable hdest) { ! /% merge hsource into hdest, leaving hsource empty. since it consumes no memory (we just unlink nodes and deposit them) it can't fail. *************** *** 1297,1301 **** x = (**hsource).hashbucket [i]; ! while (x != nil) { /*chain through the hash list%/ register hdlhashnode nextx; --- 1301,1305 ---- x = (**hsource).hashbucket [i]; ! while (x != nil) { /%chain through the hash list%/ register hdlhashnode nextx; *************** *** 1308,1315 **** } /*while%/ ! (**hsource).hashbucket [i] = nil; /*we leave the source table empty%/ ! } /*for%/ ! } /*hashmerge*/ ! /** 2/7/91 dmb: new implementation of array references resolves them --- 1312,1319 ---- } /*while%/ ! (**hsource).hashbucket [i] = nil; /%we leave the source table empty%/ ! } /%for%/ ! } /%hashmerge%/ ! */ /** 2/7/91 dmb: new implementation of array references resolves them *************** *** 1329,1334 **** return (hashlocate (bsvarname, hnode, hprev)); ! } /*hashlocatearray%/ ! boolean hashstringtoarrayindex (bigstring bs, short *arrayindex) { --- 1333,1338 ---- return (hashlocate (bsvarname, hnode, hprev)); ! } /%hashlocatearray%/ ! boolean hashstringtoarrayindex (bigstring bs, short *arrayindex) { *************** *** 1336,1340 **** bigstring bscopy; ! if (stringlength (bs) == 0) /*empty names not allowed, defensive driving%/ return (false); --- 1340,1344 ---- bigstring bscopy; ! if (stringlength (bs) == 0) /%empty names not allowed, defensive driving%/ return (false); *************** *** 1354,1361 **** return (true); ! } /*hashstringtoarrayindex%/ */ ! static boolean hashlocate (const bigstring bs, hdlhashnode *hnode, hdlhashnode *hprev) { /* --- 1358,1365 ---- return (true); ! } /%hashstringtoarrayindex%/ */ ! boolean hashlocate (const bigstring bs, hdlhashnode *hnode, hdlhashnode *hprev) { /* *************** *** 1450,1454 **** return (true); ! } /*hashdeletenode*/ --- 1454,1459 ---- return (true); ! } /%hashdeletenode%/ ! */ *************** *** 1531,1539 **** ! static boolean hashsetlocalityvisit (hdlhashnode hnode, ptrlocalityinfo info) { hdlhashtable ht; hdlexternalvariable hv; tyvaluerecord val = (**hnode).val; if (val.valuetype == externalvaluetype) { --- 1536,1545 ---- ! static boolean hashsetlocalityvisit (hdlhashnode hnode, ptrvoid refcon) { hdlhashtable ht; hdlexternalvariable hv; tyvaluerecord val = (**hnode).val; + ptrlocalityinfo info = (ptrlocalityinfo) refcon; if (val.valuetype == externalvaluetype) { *************** *** 1961,1965 **** return (true); ! } /*hashinsertaddress*/ --- 1967,1972 ---- return (true); ! } /%hashinsertaddress%/ ! */ *************** *** 2175,2181 **** ! static boolean nodeintablevisit (hdlhashnode hnode, hdlhashnode hnodelookfor) { ! return (hnode != hnodelookfor); /*false terminates traversal*/ } /*nodeintablevisit*/ --- 2182,2188 ---- ! static boolean nodeintablevisit (hdlhashnode hnode, ptrvoid refcon) { ! return (hnode != (hdlhashnode) refcon); /*false terminates traversal*/ } /*nodeintablevisit*/ *************** *** 2502,2506 **** ! static boolean hashpackvisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, typackinforecord *pi) { /* --- 2509,2513 ---- ! static boolean hashpackvisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, ptrvoid refcon) { /* *************** *** 2525,2528 **** --- 2532,2536 ---- */ + typackinforecord *pi = (typackinforecord *) refcon; tydisksymbolrecord rec; bigstring bsvalue; |
