$RBGB/cvsdiff080114.txt ----------------------------- cvs diff . |& grepdiff > cvsdiff080114.txt ---------------------------------------- cvs diff: Diffing pr_util_nolog/alpha cvs diff: Diffing pr_util_nolog/alpha/bin cvs diff: Diffing pr_util_nolog/alpha/obj cvs diff: Diffing pr_util_nolog/alpha/probj cvs diff: Diffing schema cvs diff: Diffing schema/altSchemas cvs diff: Diffing src cvs diff: Diffing symtxt cvs diff: Diffing test cvs diff: Diffing tools 14:diff -r1.4 94sbde_schema.h 155:diff -r1.7 dprint.c 249:diff -r1.7 94sbde_schema.h 280:diff -r1.7 dprint.c ------------------------------------- cvs diff . >>& cvsdiff080114.txt ------------------------------------------------------------ cvs diff: Diffing . 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/94sbde_schema.h =================================================================== RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/pr_util_log/94sbde_schema.h,v retrieving revision 1.4 diff -r1.4 94sbde_schema.h 19c19,20 < /* dprint.c #includees 9*schema.h which gets dprint.h */ --- > /* dprint.c #includes 9*schema.h which gets dprint.h */ > /* DEBUG #defined in gcc/g++ command line - RJL */ 51,52c52,53 < #define hcg_declare(tbl) *tbl = NULL , *tbl##curr = NULL , *tbl##temp = NULL , *tbl##end = NULL , *tbl##elt = NULL,\ < *tbl##curr2 = NULL , *tbl##temp2 = NULL --- > #define hcg_declare(tbl) *tbl = NULL , *tbl##curr = NULL , *tbl##temp = NULL , \ > *tbl##end = NULL , *tbl##elt = NULL, *tbl##curr2 = NULL , *tbl##temp2 = NULL 54c55,56 < #define hcg_declare(tbl) *tbl, *tbl##curr, *tbl##temp, *tbl##end, *tbl##elt, *tbl##curr2, *tbl##temp2 --- > #define hcg_declare(tbl) *tbl, *tbl##curr, *tbl##temp, \ > *tbl##end, *tbl##elt, *tbl##curr2, *tbl##temp2 78a81 > #define BUFFERSIZE 2048 /* undefined before 070313 - RJL*/ 83a87 > #define MAXPATHNAMELENGTH 256 /* New 070412: for data file selection */ 91,92c95,96 < < --- > /* added manually - RJL070402 */ > #define MAXTABLES HCG_NUM_TABLES 172a177,179 > extern int find_tbl_idx(const char *); > extern int find_view_idx(const char *); > 188c195 < #endif /*__cplusplus*/ --- > #endif /*ifndef __cplusplus*/ 190a198,247 > /* C function prototypes for the C++ compiler */ > #define pr_add(a,b,c) do_pr_add(a,#b,c) > > /***********************************************/ > /* This following is a type definition for generic pointers */ > /* copied from pr_util_nolog/9*schema.h - RJL071205 */ > /***********************************************/ > #ifdef __STDC__ > typedef void * hcg_ptr; > #else > typedef char * hcg_ptr; > #endif > > /* These moved up from line 833:: - RJL070218 */ > > #ifdef __cplusplus > extern "C" { > extern int find_tbl_idx(const char *); > extern int find_view_idx(const char *); > extern int encode( char *, hcg_key * ); > extern void pr_find_bt(char *, hcg_key *); > extern char *decode_retstr(hcg_key *); > extern int decode(char *, hcg_key *); > extern int key_compare(hcg_key *, hcg_key *); > extern char *get_abbr(hcg_key *, char *); > extern int get_version(hcg_key *); > extern int get_row(hcg_key *); > extern int set_abbr(hcg_key *, char *); > extern int set_version(hcg_key *, int); > extern int set_row(hcg_key *, int); > extern hcg_key *null_key(void); > extern int is_null_key(hcg_key *); > extern void pr_init (char *, char *); > extern hcg_ptr pr_gen_create(size_t); > extern void do_pr_add(char *, char *, hcg_ptr); > extern void pr_load(char *, char *); > extern void pr_del(int); > extern void pr_free(void); > extern void pr_stats(char *, char *); > extern void pr_dump(char *, char *, int, char *); > } > #endif > #ifndef __cplusplus /* else undefined references in pr_dump.c */ > extern int find_tbl_idx(const char *); > extern int find_view_idx(const char *); > #endif > > #ifndef __cplusplus > extern hcg_ptr pr_gen_create(size_t); > #endif 248a306,313 > > /*hcg_view_list is num_views + view_list[MAXVIEWS].-RJL070202 */ > /*view_list[MAXVIEWS] is an array of rows containing 3 fields: */ > /*char viewname[], mode[1], version_list[HCG_NUMTABLES] */ > /* version_list[tableindex] contains a char value in range [1..99] */ > /* TBD: what if NO versions allowed? - check viewdef semantics */ > /* index 0 = NULL char value '\0' can be stored, but: */ > /* Bug 070327: '\0' char or ctrl-chars are not printable. (Don't try). */ 277c342 < /*(213-274)*/ --- > 287c352 < --- > #if 0 301a367,368 > #endif > /* #if 0 */ 311c378 < --- > /* In use, but deprecated - TBD: use gen13's pr_accessors.c, better */ 518c585,586 < --- > //TBD: Replace by func in dprint.c -RJL071205 > #if 0// Done - copied from pr_util_ nolog schema.h - RJL0712105 523c591 < --- > #endif 579c647,648 < #define pr_dump_row(tbl,viewname,file_fp,file_name,new_version,modestr) dump_row(#tbl,viewname,file_fp,file_name,new_version,modestr) --- > #define pr_dump_row(tbl,viewname,file_fp,file_name,new_version,modestr) \ > dump_row(#tbl,viewname,file_fp,file_name,new_version,modestr) 722c791 < /* row that that meets the view (based on version number). */ --- > /* row that that meets the view (table-type-subset - any version number?). */ 816a886 > 817a888,889 > #if 0 > //remade into comment now - after earlier move up - RJL071205 847c919 < --- > #endif Index: pr_util_log/dprint.c =================================================================== RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/pr_util_log/dprint.c,v retrieving revision 1.7 diff -r1.7 dprint.c 1c1 < /* dprintf.c - functions to provide printf under DEBUG control. */ --- > /*  dprintf.c - functions to provide printf under DEBUG control. */ 55,56c55,57 < #include < #include --- > #include > /* #include schema.h #includes this */ > #include "94sbde_schema.h" // #includes "dprint.h", 59,60c60,80 < extern int find_tbl_idx(const char *); < extern int find_view_idx(const char *); --- > //extern int find_tbl_idx(const char *); > //extern int find_view_idx(const char *); > > > /************************************************************************/ > /* Schema and viewdefs skip 1-line comments with prefix '/_/' or '/_* */ > /* WARNING: comment terminator not checked; Multi-line comment will not */ > /* be recognized - result is a client responsibility. */ > /* No side effects; Pre-cond: *tokptr is a string of length >= 1. */ > /* Moved to dprint.c out of pr_load.c - RJL060307,070324 */ > /************************************************************************/ > /* notacomment, isComment both now in dprint.c - RJL070323: */ > > int notacomment(const char* tokptr) /* dprint.c: */ > { > /* No side effects; Pre-cond: *tokptr is a string of length >= 1. */ > return((strncmp(tokptr,"/*",2)!=0 && strncmp(tokptr,"//",2)!=0)? 1 : 0); > } /* end notacomment: dprint.c */ > > > 120c140,170 < /* printrowcounts() - moved from src/fileio,.cc to dprint.c- RJL060807 */ --- > /***********************************************************************/ > /* Function get_rcount returns the number of rows currently loaded in the */ > /* specified table, iff in the specified view/version). [was pr_rcount]*/ > /* If tbl is not a ttabbr in the view, 0 is returned. */ > /* Side-effects: find_{tbl,view}_idx() updates hcg_{tbl,view}_idx resp.*/ > /***********************************************************************/ > /* Replaces macro in 94sbde_schema.h - RJL070126 */ > /* Added '&&find_tbl_idx(tbl)' (side effect: update hcg_tbl_idx)-RJL060806 > * Clients (e.g. printrowcounts in dprint.c) must now quote arg2= tbl > * Index tsListIdx in get_rcount macro casts version_list[] char to unsigned int - RJL070202 > */ > int get_rcount(const char* viewname, const char* tbl) /* RJL070208 */ > { > unsigned int tsListIdx; /* to simplify the expression below */ > /* find_view_idx returns T/F and sets hcg_view_idx in [-1..HGG_NUM_VIEWS]*/ > /* find_tbl_idx returns T/F and sets hcg_tbl_idx in [-1..HGG_NUM_TABLES]*/ > int rcount; > EP; > tsListIdx = (unsigned int) > hcg_view_list.view_list[hcg_view_idx].version_list[hcg_tbl_idx]; > dprintd("tsListIdx = %d depends on ", tsListIdx); > dprintdd("hcg_view_idx = %d, hcg_tbl_idx = %d\n", hcg_view_idx, hcg_tbl_idx); > > rcount = ((find_view_idx(viewname) && (find_tbl_idx(tbl)) ) ? > hcg_ts_list[hcg_tbl_idx].ts_list[tsListIdx].rcount : 0 ); > dprintds("rcount = %d for tbl %s\n", rcount, tbl); > > LP; return rcount; > } /* end get_rcount */ > > /* printrowcounts() - moved from src/fileio.cc to dprint.c- RJL060807 */ 135,136c185,186 < /* Pre-cond'ns: */ < void printrowcounts(const char* viewname) /*:831-855:)*/ --- > /* Pre-cond'ns: valid viewname, */ > void printrowcounts(const char* viewname) /*:161-188:)*/ 163c213,214 < LP;} // end printrowcounts (:831-855:) --- > LP;} // end printrowcounts (:161-188:) > cvs diff: pr_util_log/save_pr_files.csh is a new entry, no comparison available cvs diff: Diffing pr_util_log/alpha cvs diff: Diffing pr_util_log/alpha/bin cvs diff: Diffing pr_util_log/alpha/obj cvs diff: Diffing pr_util_log/alpha/probj cvs diff: Diffing pr_util_log/i386-linux cvs diff: Diffing pr_util_log/i386-linux/probj cvs diff: Diffing pr_util_nolog Index: pr_util_nolog/94sbde_schema.h =================================================================== RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/pr_util_nolog/94sbde_schema.h,v retrieving revision 1.7 diff -r1.7 94sbde_schema.h 370c370 < (struct tbl_abbr *) pr_gen_create( sizeof( struct tbl_abbr)); --- > (struct tbl_abbr *) pr_gen_create( sizeof( struct tbl_abbr)) 685d684 < 687,689c686,688 < /* This macro is used to locate the row in the specified table whose primary */ < /* key is the one specified and set the tbl##curr ptr. */ < /* New RJL 070129: Alters tbl##curr IFF cached value doesn't match: */ --- > /* Macro pr_find locates the row in the specified table whose primary */ > /* key is the one specified and sets tbl##curr ptr. (Updated RJL 070129) */ > /* Alters tbl##curr if cached value doesn't match: (==pr_util_[no]log). */ 690a690 > 872c872,873 < // #if 0 --- > #if 0 > //remade into comment now - after earlier move up - RJL071205 906c907,908 < //#endif --- > #endif > Index: pr_util_nolog/dprint.c =================================================================== RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/pr_util_nolog/dprint.c,v retrieving revision 1.7 diff -r1.7 dprint.c 1c1 < /* dprintf.c - functions to provide printf under DEBUG control. */ --- > /* dprintf.c - functions to provide printf under DEBUG control. */ ------------------------------------------------------------------------