saturn.cs.uml.edu(11)> pwd ~lechner/bde2alpha_rl/sandbox/bdeNT050526/bdegen13/bde saturn.cs.uml.edu(15)> date 060113:2049 saturn.cs.uml.edu(13)> wc bde060113.cvsdiff 241 883 7610 bde060113.cvsdiff (No signif. diffs except comments, cvs diff fileio.cc and cvs diff graphobject.cc, and EP;,LP; inserts in menubar_cb.cc.) saturn.cs.uml.edu(12)> cvs diff . >& bde060113.cvsdiff --------------------------------------------------------- cvs diff: Diffing . Index: xmkmflog.csh =================================================================== RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/xmkmflog.csh,v retrieving revision 1.5 diff -r1.5 xmkmflog.csh 81c81 < --- > date Index: xmkmfnolog.csh =================================================================== RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/xmkmfnolog.csh,v retrieving revision 1.5 diff -r1.5 xmkmfnolog.csh 72a73 > date cvs diff: Diffing doc cvs diff: Diffing doc/idraw cvs diff: Diffing executables cvs diff: Diffing executables/alpha cvs diff: Diffing executables/i386-linux cvs diff: Diffing include cvs diff: Diffing lib cvs diff: Diffing pr_util_log Index: pr_util_log/Imakefile =================================================================== RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/pr_util_log/Imakefile,v retrieving revision 1.5 diff -r1.5 Imakefile 1,2c1,2 < #/ ******************************************************************* < ## The '#' is a comment to Makefiles; /_* is not.-RJHL0050812 --- > # /******************************************************************* > ## The '#' is a comment to Makefiles; /_* is not.-RJL050812 Index: pr_util_log/pr_load.c =================================================================== RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/pr_util_log/pr_load.c,v retrieving revision 1.2 diff -r1.2 pr_load.c 291a292,293 > > /* RJL051217: It looks prone to string overflow in input buffer char *s.*/ > > /* RJL051217: Should s[BUFSIZE-1] = '\0' to avoid input overflow? */ 310c312 < --- > assert((*idx) /* RJL051217: It looks prone to string overflow in input buffer char *s.*/ > /* RJL051217: Should s[BUFSIZE-1] = '\0' to avoid input overflow? */ 296c298 < --- > 299c301 < (*idx)++; --- > (*idx)++; 302,304c304,306 < { < w[i++] = s[*idx]; < (*idx)++; --- > { > w[i++] = s[*idx]; > (*idx)++; 308c310 < --- > 311c313 < --- > assert((*idx) // #ifdef STARTLOG , call pr_startlog() in fileio.cc -RJL050909 > // (where to call startlog ? before main loop? -RJL051215) > Index: src/fileio.cc =================================================================== RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/src/fileio.cc,v retrieving revision 1.31 diff -r1.31 fileio.cc 1593c1593 < //iff needed (null infile or "SR" not found) --- > // iff needed (null infile or "SR" not found) 1598c1598 < EP; dprints("arg1 = infile = %s\n",infile); --- > EP; dprints("arg1 = infile = %s\n",infile); /* trace entries */ 1608d1607 < /* trace entries */ 1623c1622 < // New - RJL050909: try to enable logging at file-opening:i --- > // New - RJL050909: try to enable logging at file-opening: 1624a1624,1628 > ////////////////////////////////////////////// > #define STARTLOG > //TBD: Make this a bde command line option > #ifdef STARTLOG > // STARTLOG enables logging. TBD: make this a bde .dat file command? 1625a1630 > // BDELOG compiles log/replay code into pr_util_log. 1626a1632,1633 > #else > fprintf(stderr, "Can't call startlog; pr_util_log library is required.\n"); 1627a1635,1636 > #endif > //////////////////////////////////////////////// 1634c1643,1644 < //XmCreateSelectionDialog to select HGid to display - RJL 94/8/2 --- > //XmCreateSelectionDialog to select HGid to display? - RJL 94/8/2 > //We really want to select filename first, then HG-row - RJL051215 1640,1641c1650,1651 < // What is pr_rcount(..,HG) if infile is empty? < number_of_graphs = pr_rcount("94sbdeview", HG); // from pr_load( , infile)) --- > // What is pr_rcount(..,HG) if infile is empty?(number_of_graphs==0) > number_of_graphs = pr_rcount("94sbdeview", HG); // after pr_loadng 1643c1653,1655 < // What if current_filename is NULL? --- > // if current_filename is NULL, number_of_graphs = 0; > dprintsd("Current_filename %s has %d HG-rows\n", > current_filename, number_of_graphs); 2097a2110,2111 > fprintf(stdout, > "\n\tdoexit called: bde main loop exits; \n\n"); 2183c2197 < } //end GetUserName --- > LP;} //end GetUserName 2333c2347 < LP;} // end GetBDEDatFileList (2200-2235) --- > } // end GetBDEDatFileList (2200-2235) Index: src/graphobject.cc =================================================================== RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/src/graphobject.cc,v retrieving revision 1.22 diff -r1.22 graphobject.cc 1663c1663,1664 < --- > // Call: topobject->doDump(); > // TBD: Pass viewname to control output - RJL051215 1667c1668 < List *currentlp; // local currentlp subobject --- > List *currentlp; // init to topobject->subobjects below 1722c1723 < const char* tbltypes = "FO GD HG HN HA HL HP HI CG GX"; --- > const char* tbltypes = "FO GD HG HN HA HL HP HI CG GX"; //bytes[0..29] 1727,1732d1727 < case 0: FOcurr = (struct FO*)rp; < pr_dump_row(FO, viewname, graphdump_fp, "graphDump.txt",0,"a"); < break; < case 1: GDcurr = (struct GD*)rp; < pr_dump_row(GD, viewname, graphdump_fp, "graphDump.txt",0,"a"); < break; 1745c1740,1742 < default: dprintd("doDump default case: ignore tblidx = %d\n", tblidx); --- > default: dprintsd( > "default: tblabbr=%s,tblidx=%d, should not be in graphobjectlist \n", > tblabbr,tblidx); Index: src/menubar_cb.cc =================================================================== RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/src/menubar_cb.cc,v retrieving revision 1.8 diff -r1.8 menubar_cb.cc 9,12c9,12 < // Routines : file_cb() < // edit_cb() < // config_cb() < // help_cb() --- > // Routines : file_cb() // Most important > // edit_cb() // Not used - RJL051215 > // config_cb() // node text mode used (toggle HN.name vs. HA) > // help_cb() //Not used - RJL051215 134c134 < { --- > {EP; 157c157 < } --- > LP;} 168c168 < { --- > {EP; 197,198c197,198 < } < } --- > } // end switch(item) > LP;} //end edit_cb 209c209 < { --- > {EP; 240c240 < } // end config_cb() --- > LP;} // end config_cb() cvs diff: Diffing symtxt cvs diff: Diffing test cvs diff: cannot find test/hi.dat cvs diff: Diffing tools