Menu
▾
▴
[frontierkernel-commits] Frontier/Common/source opxml.c,1.4,1.5,
|
From: Andre R. <and...@us...> - 2006-02-27 21:46:34
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11700 Modified Files: opxml.c Log Message: Fixed funky formatting. No functional changes expected. Index: opxml.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/opxml.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** opxml.c 11 Jan 2005 22:48:09 -0000 1.4 --- opxml.c 27 Feb 2006 21:46:29 -0000 1.5 *************** *** 814,879 **** static boolean opxmlrecursivelyvisit (hdlheadrecord h, short lev, opvisitcallback visit, ptrvoid refcon) { - - register hdlheadrecord nomad, nextnomad; - - if (h == nil) - return (true); - - nomad = (**h).headlinkright; - - if (nomad == h) /*nothing to the right*/ - return (true); - - while (true) { - - nextnomad = (**nomad).headlinkdown; - - if (!(*visit) (nomad, refcon)) - return (false); - - if (lev > 1) { - - if (!(**nomad).fldynamic) { - - if (!oprecursivelyvisit (nomad, lev - 1, visit, refcon)) - return (false); - } /*if*/ - } - - if (nextnomad == nomad) /*just processed last subhead*/ - return (true); - - nomad = nextnomad; - } /*while*/ --- 814,847 ---- *************** *** 881,947 **** - - - static boolean opxmlvisitnondynamicnodes (opvisitcallback visit, ptrvoid refcon) { - - /* - visit every node in the outline -- unless it's the child of a dynamic node. - */ - - hdlheadrecord nomad = (**outlinedata).hsummit, nextnomad; - - while (true) { - - nextnomad = (**nomad).headlinkdown; - - if (!(*visit) (nomad, refcon)) /*visit the summit*/ - return (false); - - if (!(**nomad).fldynamic) { - - if (!opxmlrecursivelyvisit (nomad, infinity, visit, refcon)) /*visit its subs*/ - return (false); - } /*if*/ - - if (nextnomad == nomad) - return (true); - - nomad = nextnomad; - } /*while*/ - - } /*opxmlvisitnondynamicnodes*/ - - - static boolean opxmlbodyvisit (hdlheadrecord hnode, ptrvoid htext) { --- 849,882 ---- *************** *** 953,958 **** as many as needed. - - 7.0b30 PBS: handle a dynamic node -- it has subs, but pretend it doesn't, --- 888,891 ---- *************** *** 983,1009 **** if (nextlevel == indentlevel) - fl = true; - - if (nextlevel > indentlevel) - - - flsubs = true; - - if ((**hnode).fldynamic) /*7.0b30: dynamic nodes may have subs, but we ignore them.*/ - - - flsubs = false; if (flsubs) /*Has subs?*/ - fl = pushtexthandle ("\x02"">\r", htext); /*Add closing > and carriage return.*/ - else { /*No subs*/ --- 916,929 ---- *************** *** 1015,1026 **** if (nextlevel < indentlevel) /*Need to close off outline items?*/ - fl = opxmlpushclosingoutlinetags (htext, indentlevel, nextlevel); /*Add as many </outline> tags as needed.*/ if (hnode == hflatdown) /*At the end of the outline?*/ - fl = opxmlpushclosingoutlinetags (htext, indentlevel, 2); /*Add as many </outline> tags as needed.*/ ! exit: disposehandle (h); --- 935,944 ---- if (nextlevel < indentlevel) /*Need to close off outline items?*/ fl = opxmlpushclosingoutlinetags (htext, indentlevel, nextlevel); /*Add as many </outline> tags as needed.*/ if (hnode == hflatdown) /*At the end of the outline?*/ fl = opxmlpushclosingoutlinetags (htext, indentlevel, 2); /*Add as many </outline> tags as needed.*/ ! exit: disposehandle (h); *************** *** 1184,1196 **** /*Clean up*/ ! exit3: disposevaluerecord (vtimemodified, false); ! exit2: disposevaluerecord (vtimecreated, false); ! exit: disposehandle (hexpansionstate); --- 1102,1114 ---- /*Clean up*/ ! exit3: disposevaluerecord (vtimemodified, false); ! exit2: disposevaluerecord (vtimecreated, false); ! exit: disposehandle (hexpansionstate); *************** *** 1338,1379 **** - static boolean opxmlheadexists (hdlhashtable ht) { - - /* - 7.0b33 PBS: return true if there's a required <head> section of the document. - */ - - hdlhashnode hn; - - for (hn = (**ht).hfirstsort; hn != nil; hn = (**hn).sortedlink) { /*loop through the table*/ - - if (isxmlmatch (hn, STR_head)) /*is this the name we're looking for?*/ - - - return (true); /*Found; return true.*/ - } /*for*/ - - return (false); - } /*opxmlheadexists*/ - - static boolean opxmlgetonevalue (hdlhashtable ht, bigstring bsname, Handle htext) { --- 1256,1277 ---- *************** *** 1489,1498 **** if (!shellmovewindowhidden (hinfo, windowleft, windowtop)) /*Set window position*/ - return (false); /*shellmovewindow always returns true at this writing, but that could change*/ - /*Set the window size*/ ! if (!opxmlgetoneshortvalue (ht, STR_windowright, &windowright)) return (false); --- 1387,1394 ---- if (!shellmovewindowhidden (hinfo, windowleft, windowtop)) /*Set window position*/ return (false); /*shellmovewindow always returns true at this writing, but that could change*/ /*Set the window size*/ ! if (!opxmlgetoneshortvalue (ht, STR_windowright, &windowright)) return (false); *************** *** 1581,1585 **** htext = nil; ! exit1: if (htext != nil) --- 1477,1481 ---- htext = nil; ! exit1: if (htext != nil) *************** *** 1920,1928 **** fl = true; /*success*/ ! exit2: disposevaluerecord (vbinary, false); ! exit1: return (fl); --- 1816,1824 ---- fl = true; /*success*/ ! exit2: disposevaluerecord (vbinary, false); ! exit1: return (fl); *************** *** 1983,1987 **** fl = true; /*success*/ ! exit: return (fl); --- 1879,1883 ---- fl = true; /*success*/ ! exit: return (fl); |
