Menu
▾
▴
[frontierkernel-commits] Frontier/Common/source OpenTransportNetEvents.c,1.5,1.6 odbengine.c,1.2,1.3 CallMachOFrameWork.c,1.2,1.3 claybrowservalidate.c,1.2,1.3 cancoon.c,1.2,1.3 dbverbs.c,1.2,1.3 claycallbacks.c,1.2,1.3 db.c,1.3,1.4 claybrowserstruc.c,1.2,1.3 claylinelayout.c,1.2,1.3
|
From: Andre R. <and...@us...> - 2004-10-31 18:00:02
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12408 Modified Files: OpenTransportNetEvents.c odbengine.c CallMachOFrameWork.c claybrowservalidate.c cancoon.c dbverbs.c claycallbacks.c db.c claybrowserstruc.c claylinelayout.c Log Message: Fixed GCC compiler warnings. Index: dbverbs.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/dbverbs.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** dbverbs.c 23 Oct 2004 22:16:17 -0000 1.2 --- dbverbs.c 31 Oct 2004 17:59:48 -0000 1.3 *************** *** 528,531 **** --- 528,533 ---- + #if 0 + static ptrfilespec fsfind; *************** *** 553,556 **** --- 555,560 ---- } /*odbfindfilevisit*/ + #endif + static boolean dbnewverb (hdltreenode hparam1, tyvaluerecord *vreturned) { Index: claycallbacks.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/claycallbacks.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** claycallbacks.c 23 Oct 2004 22:14:37 -0000 1.2 --- claycallbacks.c 31 Oct 2004 17:59:48 -0000 1.3 *************** *** 373,377 **** #endif ! #if odbbrowser static boolean xxxfilegetprefsspec (bigstring fname, tybrowserspec *fsprefs) { --- 373,377 ---- #endif ! #if 0 //odbbrowser static boolean xxxfilegetprefsspec (bigstring fname, tybrowserspec *fsprefs) { *************** *** 592,596 **** ! static boolean clayfolderloopvisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, tycallbackinfo *cbinfo) { /* --- 592,596 ---- ! static boolean clayfolderloopvisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, ptrvoid refcon) { /* *************** *** 602,605 **** --- 602,606 ---- tybrowserspec fs; tybrowserinfo info; + tycallbackinfo *cbinfo = (tycallbackinfo *) refcon; fs.vRefNum = (*cbinfo).hdatabase; *************** *** 819,822 **** --- 820,825 ---- #endif + #if 0 + static boolean xxxclayinitializeoutline (void) { *************** *** 862,865 **** --- 865,870 ---- } /*clayinitializeoutline*/ + #endif + #if filebrowser Index: CallMachOFrameWork.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/CallMachOFrameWork.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CallMachOFrameWork.c 23 Oct 2004 22:12:44 -0000 1.2 --- CallMachOFrameWork.c 31 Oct 2004 17:59:48 -0000 1.3 *************** *** 122,126 **** ! static OSStatus LoadFrameworkBundle(CFStringRef framework, CFBundleRef *bundlePtr) /*Adapted from Apple sample code*/ { OSStatus err; --- 122,126 ---- ! OSStatus LoadFrameworkBundle(CFStringRef framework, CFBundleRef *bundlePtr) /*Adapted from Apple sample code*/ { OSStatus err; Index: OpenTransportNetEvents.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/OpenTransportNetEvents.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** OpenTransportNetEvents.c 29 Oct 2004 00:12:20 -0000 1.5 --- OpenTransportNetEvents.c 31 Oct 2004 17:59:48 -0000 1.6 *************** *** 3545,3549 **** ! boolean fwsNetEventCheckAndAcceptSocket () { /* --- 3545,3549 ---- ! boolean fwsNetEventCheckAndAcceptSocket (void) { /* Index: claylinelayout.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/claylinelayout.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** claylinelayout.c 23 Oct 2004 22:14:51 -0000 1.2 --- claylinelayout.c 31 Oct 2004 17:59:48 -0000 1.3 *************** *** 98,101 **** --- 98,102 ---- memtodiskshort (rgb.blue); } while (0) + #if 0 static boolean midcolorof (Rect r, RGBColor *rgb1, RGBColor *rgb2, RGBColor *rgbmid) { *************** *** 118,132 **** return (true); #endif ! } /*darkcolorof*/ ! ! ! static void darkcolorof (RGBColor *rgb) { ! ! (*rgb).red -= (*rgb).red / 4; ! ! (*rgb).green -= (*rgb).green / 4; ! ! (*rgb).blue -= (*rgb).blue / 4; ! } /*darkcolorof*/ --- 119,123 ---- return (true); #endif ! } /*midcolorof*/ *************** *** 140,143 **** --- 131,146 ---- } /*lightcolorof*/ + #endif + + + static void darkcolorof (RGBColor *rgb) { + + (*rgb).red -= (*rgb).red / 4; + + (*rgb).green -= (*rgb).green / 4; + + (*rgb).blue -= (*rgb).blue / 4; + } /*darkcolorof*/ + /*static boolean claypushtextstyle (diskfontstring fontname, short fontsize) { *************** *** 151,155 **** return (pushstyle (fontnum, fontsize, 0)); ! } /*claypushtextstyle*/ --- 154,159 ---- return (pushstyle (fontnum, fontsize, 0)); ! } /%claypushtextstyle%/ ! */ *************** *** 547,550 **** --- 551,556 ---- + #if 0 + static void getfatsizestring (tybrowserinfo *browserinfo, bigstring bs) { *************** *** 567,570 **** --- 573,578 ---- getsizestring ((*browserinfo).filesize, bs); } /*getfatsizestring*/ + + #endif *************** *** 598,604 **** /* ! /*an experiment -- try to give the files "depth" or 3D indentation%/ { ! /*top and left edges are framed in dark color%/ { RGBColor rgb = (**hf).linelayout.backcolor; --- 606,612 ---- /* ! /%an experiment -- try to give the files "depth" or 3D indentation%/ { ! /%top and left edges are framed in dark color%/ { RGBColor rgb = (**hf).linelayout.backcolor; *************** *** 629,633 **** } ! /*bottom and right edges are framed in light color%/ { RGBColor rgb = (**hf).linelayout.backcolor; --- 637,641 ---- } ! /%bottom and right edges are framed in light color%/ { RGBColor rgb = (**hf).linelayout.backcolor; *************** *** 787,791 **** hdltableformats hf = tableformatsdata; RGBColor rgb = (**hf).linelayout.filenamecolor; - hdloutlinerecord ho = outlinedata; claypushnodestyle (hnode); --- 795,798 ---- Index: odbengine.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/odbengine.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** odbengine.c 23 Oct 2004 22:38:34 -0000 1.2 --- odbengine.c 31 Oct 2004 17:59:48 -0000 1.3 *************** *** 295,335 **** ! static short tablecomparenames (hdlhashtable ht, hdlhashnode hnode1, hdlhashnode hnode2) { ! bigstring bs1, bs2; ! ! gethashkey (hnode1, bs1); ! gethashkey (hnode2, bs2); ! ! alllower (bs1); /*comparison is unicase*/ ! ! alllower (bs2); ! ! return (comparestrings (bs1, bs2)); ! } /*tablecomparenames*/ - static boolean odbtabledirty (hdlhashtable htable, const bigstring bsname) { - - // hdltablediskrecord hf = (hdltablediskrecord) (**htable).hashtableformats; - - // if (hf != nil) - (**htable).timelastsave = timenow (); /*modification time until saved*/ - - return (true); - } /*tabledirty*/ ! static boolean odbsymbolchanged (hdlhashtable htable, const bigstring bsname, hdlhashnode hnode, boolean flvalue) { ! ! return (odbtabledirty (htable, bsname)); ! } /*odbsymbolchanged*/ ! static boolean odbsymbolunlinking (hdlhashtable ht, hdlhashnode hn) { ! return (true); ! } /*odbsymbolunlinking*/ - #ifndef isFrontier static void initlangcallbacks (void) { --- 295,336 ---- ! #ifndef isFrontier ! static short tablecomparenames (hdlhashtable ht, hdlhashnode hnode1, hdlhashnode hnode2) { ! bigstring bs1, bs2; ! ! gethashkey (hnode1, bs1); + gethashkey (hnode2, bs2); + + alllower (bs1); /*comparison is unicase*/ + + alllower (bs2); + + return (comparestrings (bs1, bs2)); + } /*tablecomparenames*/ ! static boolean odbtabledirty (hdlhashtable htable, const bigstring bsname) { ! ! // hdltablediskrecord hf = (hdltablediskrecord) (**htable).hashtableformats; ! ! // if (hf != nil) ! (**htable).timelastsave = timenow (); /*modification time until saved*/ ! ! return (true); ! } /*tabledirty*/ ! static boolean odbsymbolchanged (hdlhashtable htable, const bigstring bsname, hdlhashnode hnode, boolean flvalue) { ! ! return (odbtabledirty (htable, bsname)); ! } /*odbsymbolchanged*/ ! static boolean odbsymbolunlinking (hdlhashtable ht, hdlhashnode hn) { ! ! return (true); ! } /*odbsymbolunlinking*/ static void initlangcallbacks (void) { *************** *** 462,466 **** */ - hdlcancoonrecord hc = nil; tyversion2cancoonrecord info; dbaddress adr = nildbaddress; --- 463,466 ---- Index: cancoon.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/cancoon.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cancoon.c 23 Oct 2004 22:12:59 -0000 1.2 --- cancoon.c 31 Oct 2004 17:59:48 -0000 1.3 *************** *** 380,384 **** disposeprocesslist ((**hc).hprocesslist); /*checks for nil*/ ! /**setcurrentmenubarlist (nil); /*clear menubar.c global before disposing roottable*/ disposehandle ((Handle) (**hc).hmenubarlist); /*roottable disposal will do menubars*/ --- 380,384 ---- disposeprocesslist ((**hc).hprocesslist); /*checks for nil*/ ! //setcurrentmenubarlist (nil); /*clear menubar.c global before disposing roottable*/ disposehandle ((Handle) (**hc).hmenubarlist); /*roottable disposal will do menubars*/ *************** *** 638,647 **** dbrefheapstring (info.adrscriptstring, &hstring); ! pullfromhandle (hstring, 0, 1, nil); // pluck out the length byte } else ! dbrefhandle (info.adrscriptstring, &hstring); ! (**hc).hscriptstring = hstring; (**hc).flflagdisabled = (info.flags & flflagdisabled_mask) != 0; --- 638,647 ---- dbrefheapstring (info.adrscriptstring, &hstring); ! pullfromhandle ((Handle) hstring, 0, 1, nil); // pluck out the length byte } else ! dbrefhandle (info.adrscriptstring, (Handle *) &hstring); ! (**hc).hscriptstring = (Handle) hstring; (**hc).flflagdisabled = (info.flags & flflagdisabled_mask) != 0; *************** *** 1017,1021 **** register hdlcancoonrecord hc; - hdlmenurecord hmenurecord = nil; hdlcancoonrecord origglobals = cancoonglobals; hdltablevariable hvariable; --- 1017,1020 ---- *************** *** 1599,1602 **** --- 1598,1603 ---- + #if 0 + static boolean cctoggleexpertmode (void) { *************** *** 1627,1630 **** --- 1628,1633 ---- } /*cctoggleexpertmode*/ + #endif + static boolean ccmenuroutine (short idmenu, short ixmenu) { *************** *** 1650,1655 **** */ - register boolean fl = true; - /* if (idmenu == 0 && ixmenu == 0) { --- 1653,1656 ---- *************** *** 1671,1679 **** /* ! if (!idmenu) { /*request to update all of our menus%/ ! /*all our menus are enabled, dmb 8/1/90%/ ! mecheckmenubar (); /*see if menubar needs to be redrawn%/ return (true); --- 1672,1680 ---- /* ! if (!idmenu) { /%request to update all of our menus%/ ! /%all our menus are enabled, dmb 8/1/90%/ ! mecheckmenubar (); /%see if menubar needs to be redrawn%/ return (true); Index: db.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/db.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** db.c 23 Oct 2004 22:15:48 -0000 1.3 --- db.c 31 Oct 2004 17:59:48 -0000 1.4 *************** *** 429,433 **** pb.ioRefNum = (hdlfilenum)((**databasedata).fnumdatabase); ! PBFlushFile (&pb, false); } #endif --- 429,433 ---- pb.ioRefNum = (hdlfilenum)((**databasedata).fnumdatabase); ! PBFlushFile ((ParmBlkPtr) &pb, false); } #endif *************** *** 1261,1264 **** --- 1261,1266 ---- + #if 0 + static boolean dbrefbytes (dbaddress adr, long ctwanted, ptrvoid pdata) { *************** *** 1289,1293 **** return (dbread (adr + sizeheader, ctwanted, pdata)); } /*dbrefbytes*/ ! static boolean dballocate (long databytes, ptrvoid pdata, dbaddress *paddress) { --- 1291,1297 ---- return (dbread (adr + sizeheader, ctwanted, pdata)); } /*dbrefbytes*/ ! ! #endif ! static boolean dballocate (long databytes, ptrvoid pdata, dbaddress *paddress) { *************** *** 1861,1864 **** --- 1865,1870 ---- + #if 0 + static boolean dbreadbytes (dbaddress adr, long offset, long ctbytes, char *pdata) { *************** *** 1885,1888 **** --- 1891,1896 ---- return (dbwrite (adr + sizeheader + offset, ctbytes, pdata)); } /*dbwritebytes*/ + + #endif *************** *** 2190,2194 **** return (dballocate (ctbytes, pdata, adr)); ! } /*dbnewarray*/ --- 2198,2203 ---- return (dballocate (ctbytes, pdata, adr)); ! } /%dbnewarray%/ ! */ Index: claybrowserstruc.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/claybrowserstruc.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** claybrowserstruc.c 23 Oct 2004 22:14:06 -0000 1.2 --- claybrowserstruc.c 31 Oct 2004 17:59:48 -0000 1.3 *************** *** 145,149 **** /* ! if (info.flvolume) { /*special case%/ (*fs).vRefNum = info.vnum; --- 145,149 ---- /* ! if (info.flvolume) { /%special case%/ (*fs).vRefNum = info.vnum; *************** *** 212,215 **** --- 212,216 ---- } /*browserchecklinelength*/ + #if 0 static boolean browserupdatefileinfo (hdlheadrecord hnode) { *************** *** 234,237 **** --- 235,240 ---- } /*browserupdatefileinfo*/ + #endif + boolean browserfileadded (hdlheadrecord hnodeparent, const tybrowserspec *fsnew, hdlheadrecord *hnew) { *************** *** 283,286 **** --- 286,291 ---- + #if 0 + static boolean browsernodeislocked (hdlheadrecord hnode) { *************** *** 312,315 **** --- 317,322 ---- } /*browserpostpaste*/ + #endif + static boolean foldercontainsfile (tybrowserspec *fsfolder, tybrowserspec *fsfile) { *************** *** 459,463 **** if (claycreatefile (&fsdest)) { ! /*update the node's refcon to reflect the new file's position & attributes* / tybrowserinfo browserinfo; --- 466,470 ---- if (claycreatefile (&fsdest)) { ! /%update the node's refcon to reflect the new file's position & attributes%/ tybrowserinfo browserinfo; *************** *** 469,474 **** return (true); ! } /*browsercreatefile*/ ! static boolean browsermoveto (hdlheadrecord hnode, tybrowserspec *fsfolder) { --- 476,481 ---- return (true); ! } /%browsercreatefile%/ ! */ static boolean browsermoveto (hdlheadrecord hnode, tybrowserspec *fsfolder) { *************** *** 1109,1112 **** --- 1116,1121 ---- + #if 0 + static boolean xxxbrowserexportscrap (hdloutlinerecord hscrap) { *************** *** 1128,1131 **** --- 1137,1142 ---- } /*browserexportscrap*/ + #endif + static void tabledisposescrap (hdloutlinerecord houtline) { *************** *** 1205,1209 **** } /*while*/ ! return (shellsetscrap ((Handle) houtline, hashscraptype, &tabledisposescrap, &tableexportscrap)); } /*browsersetscrap*/ --- 1216,1222 ---- } /*while*/ ! return (shellsetscrap ((Handle) houtline, hashscraptype, ! (shelldisposescrapcallback) &tabledisposescrap, ! (shellexportscrapcallback) &tableexportscrap)); } /*browsersetscrap*/ Index: claybrowservalidate.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/claybrowservalidate.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** claybrowservalidate.c 23 Oct 2004 22:14:25 -0000 1.2 --- claybrowservalidate.c 31 Oct 2004 17:59:48 -0000 1.3 *************** *** 46,50 **** static long dragmodified; ! static char *pastefname; typedef enum tyaction { --- 46,50 ---- static long dragmodified; ! //static char *pastefname; typedef enum tyaction { *************** *** 189,193 **** ! static boolean collisionvisit (hdlheadrecord hnode, ptrdraginfo draginfo) { /* --- 189,193 ---- ! static boolean collisionvisit (hdlheadrecord hnode, ptrvoid refcon) { /* *************** *** 196,199 **** --- 196,200 ---- bigstring bsnode, bsdrag; + ptrdraginfo draginfo = (ptrdraginfo) refcon; if (hnode == (*draginfo).hdrag) *************** *** 279,285 **** ! static boolean validatemovevisit (hdlheadrecord hnode, ptrdraginfo draginfo) { tybrowserinfo info; hdlheadrecord hdest = (*draginfo).hdest; --- 280,287 ---- ! static boolean validatemovevisit (hdlheadrecord hnode, ptrvoid refcon) { tybrowserinfo info; + ptrdraginfo draginfo = (ptrdraginfo) refcon; hdlheadrecord hdest = (*draginfo).hdest; *************** *** 339,346 **** */ - hdlheadrecord hfolder = (**hdest).headlinkleft; - #if filebrowser if (hfolder == hdest) { --- 341,348 ---- */ #if filebrowser + hdlheadrecord hfolder = (**hdest).headlinkleft; + if (hfolder == hdest) { *************** *** 422,428 **** ! static boolean compareforcopyvisit (hdlheadrecord hnode, ptrdraginfo draginfo) { bigstring bs, bsnode; if (hnode == (*draginfo).hcompare) --- 424,431 ---- ! static boolean compareforcopyvisit (hdlheadrecord hnode, ptrvoid refcon) { bigstring bs, bsnode; + ptrdraginfo draginfo = (ptrdraginfo) refcon; if (hnode == (*draginfo).hcompare) |
