$RBGB/pr_util_log.vs.nolog.dif ------------------------ diff pr_util_log pr_util_nolog | grepdiff > & pr_util_log.vs.nolog.dif 1:diff -bitw pr_util_log/94sbde_schema.h pr_util_nolog/94sbde_schema.h 6:Only in pr_util_nolog: 94sbde_schema.h.bak 7:Only in pr_util_log: 94sbde_schema.h.bak2 9:diff -bitw pr_util_log/Imakefile pr_util_nolog/Imakefile 121:Only in pr_util_nolog: Imakefile.051203.2200 122:Only in pr_util_log: Imakefile051203.2240 123:diff -bitw pr_util_log/Makefile pr_util_nolog/Makefile 160:diff -bitw pr_util_log/Makefile.bak pr_util_nolog/Makefile.bak 197:Only in pr_util_log: MakefileLog_alpha 198:Only in pr_util_log: MakefileLog_i386-linux 199:Only in pr_util_nolog: MakefileNolog_alpha 200:Only in pr_util_nolog: MakefileNolog_i386-linux 201:Only in pr_util_log: a.out 203:Only in pr_util_log: bde 204:Only in pr_util_nolog: bdemake051126.0228 205:Only in pr_util_log: cc_pr_load060202.1137 206:Only in pr_util_nolog: cvsdiff_prutilnolog.051211 207:Only in pr_util_nolog: cvsdiffpr_utilFromchgen13.051105.txt 208:Only in pr_util_nolog: datetest.csh 209:Only in pr_util_log: gcc_pr_load060202.1138 211:Only in pr_util_nolog: libname 212:diff -bitw pr_util_log/lut.c pr_util_nolog/lut.c 222:diff -bitw pr_util_log/lut.h pr_util_nolog/lut.h 231:Only in pr_util_nolog: makepr_util_nologANDbde051126.0059 232:diff -bitw pr_util_log/newprfiles050812.dif pr_util_nolog/newprfiles050812.dif 317:Only in pr_util_nolog: oldMakefiles 319:diff -bitw pr_util_log/pr_delete.c pr_util_nolog/pr_delete.c 395:diff -bitw pr_util_log/pr_dump.c pr_util_nolog/pr_dump.c 469:diff -bitw pr_util_log/pr_free.c pr_util_nolog/pr_free.c 473:Only in pr_util_log: pr_load.Epacked.c 474:Only in pr_util_log: pr_load.Epacked.c.errorlog060202.2359 475:Only in pr_util_log: pr_load.Epacked.errorlog060202.2305 476:Only in pr_util_log: pr_load.Epacked.errorlog060203.0037 477:diff -bitw pr_util_log/pr_load.c pr_util_nolog/pr_load.c 1079:Only in pr_util_log: pr_load.c.060202 1080:Only in pr_util_log: pr_load.c.errorlog060203.0053 1081:Only in pr_util_log: pr_load.cvsdiff0060203 1082:Only in pr_util_nolog: pr_load_nolog.cvsdiff 1083:Only in pr_util_log: pr_log.c 1084:Only in pr_util_log: prlogfiles.051105.0341 1085:Only in pr_util_log: prlogfiles.051108.1944 1086:Only in pr_util_log: prlogfiles.051111.0146 1087:Only in pr_util_log: prlogfiles.060116.2259 1088:Only in pr_util_nolog: prnologfiles.051105.0330 1089:Only in pr_util_nolog: prnologfiles.051126.0052 1090:Only in pr_util_nolog: prnologfiles.051201.2131 1091:Only in pr_util_nolog: prnologfiles.060116.2258 1092:Only in pr_util_log: saveprlogfiles.csh 1093:Only in pr_util_nolog: saveprnologfiles.csh 1094:Only in pr_util_log: test_decode_rtnstr.c 1095:Only in pr_util_log: testlinkparent --------------------------------------------- ============================================================== diff pr_util_log pr_util_nolog >> & pr_util_log.vs.nolog.dif ----------------------------------------------------- diff -bitw pr_util_log/94sbde_schema.h pr_util_nolog/94sbde_schema.h 27c27 < #define CHGEN_QUALIFIERS " -log -metafile" --- > #define CHGEN_QUALIFIERS " -metafile" Only in pr_util_nolog: 94sbde_schema.h.bak Only in pr_util_log: 94sbde_schema.h.bak2 Common subdirectories: pr_util_log/CVS and pr_util_nolog/CVS diff -bitw pr_util_log/Imakefile pr_util_nolog/Imakefile 2d1 < ## The '#' is a comment to Makefiles; /_* is not.-RJL050812 4,8c3,5 < # ** Revision 1.6 2006/01/16 02:34:52 lechner < # ** Merely corrected one comment date. < # ** < # ** Revision 1.5 2005/12/10 03:44:01 lechner < # ** Removed copysources: $(GENSRCS) ... dependency; now compile directly by --- > # ** Revision 1.5 2005/12/10 03:48:44 lechner > # ** Added prefix '#' to 75 revision history comment lines (probably not needed). > # ** Removed copysources: $(GENSRCS) ... dependency; now compile directly by: 12,21c9,18 < # ** Revision 1.4 2005/10/25 18:13:45 lechner < # ** #defined GENLOG and BDELOG (no longer #defined them as 1); < # ** Cosmetic improvements to comments on make idiosyncracies in BSD vs. linux. < # ** < # ** Revision 1.3 2005/08/23 21:50:33 lechner < # ** Added '#' prefix to revision comments in case they are propagated to Makefiles. < # ** Added '1' to #define GENLOG 1, #define BDELOG 1 (conditional on #ifdef LOG). < # ** Added -I$(TOP) to INCLUDES = ... < # ** Removed ';' from #ifdef linux \ EXT < # ** Added misc. .h files to depends-on list of target copysources: --- > # ** Revision 1.4 2005/10/25 18:20:02 lechner > # ** Added copysources: dependencies from these files: > # ** $(GENSRCS) $(TOP)/dprint.h $(PRDIR)/94sbde_schema.h $(PRDIR)/lut.h > # ** (This didn't prevent recompiling all pr_*.c file s. - still TBD) > # ** Added a command $(CP) 94sbde_schema.h from $PRDIR to $PROBJDIR. > # ** > # ** Revision 1.3 2005/10/23 08:50:31 lechner > # ** Added EXT=; in one case. Appended '@@\' to a blank line inside a macro. > # ** Added dependencies to the target copysources: > # ** copysources: $(GENSRCS) $(TOP)/dprint.h $(PRDIR)/94sbde_schema.h $(PRDIR)/lut.h 23,24c20,21 < # ** Revision 1.2 2005/08/12 19:21:58 lechner < # ** Fixed a missing '/*' typo, changed to PRDIR = $(TOP)/pr_util_log --- > # ** Revision 1.2 2005/08/22 16:11:55 lechner > # ** Fixed a minor typo. 26c23 < # ** Revision 1.1 2005/08/12 03:18:02 lechner --- > # ** Revision 1.1 2005/08/12 03:11:57 lechner 50,51c47,48 < # ** This Imakefile is for bde/pr_util_log. - RJL050805 < # ** It updates files in bde/{pr_util_log/{,$(HOSTTYPE)/{obj,bin}} --- > # ** This Imakefile is for bde/pr_util_nolog. - RJL050805 > # ** It updates files in bde/{pr_util_nolog/{,$(HOSTTYPE)/{obj,bin}} 83c80,82 < # **/ --- > # */ > #/* xmkmf -a --> imake includes -Dlinux: - what about make's env'mt? */ > #/* -D LinuxArchitecture is present in bde/src/Makefile on Mercury. */ 113,114c112 < INCLUDES = -I/usr/include -I$(TOPINCLUDE) -I$(SCHEMA_INCLUDE) -I$(TOP) < --- > INCLUDES = -I/usr/include -I$(TOP) -I$(TOPINCLUDE) -I$(SCHEMA_INCLUDE) 144c142 < /* omit pr_log.c, alter others */ --- > 169d166 < 172,175c169,170 < #endif < < #ifdef linux < EXT = --- > #else > EXT = ; 178a174 > @@\ 180a177 > @@\ 194,224d190 < < /* Testing notes moved down from in $PRNLOG/Imakefile-RJL050810 */ < /* Above , '$(PRDIR)/$(*).c' selects current source file */ < /* In $(*).c, parens are ESSENTIAL! -RJL050806 */ < /* src/Imakefile Ptrn rules: $(OBJDIR)%.o : $(SRCDIR)%.cc */ < /* $PR[N]LOG/Imakefile : $(PROBJDIR)%.o : $(PRDIR)%.c */ < /*$(GENOBJS):$(GENSRCS) @@\ */ < /* $(CC) -g -c -Wall $(GENDEFINES) $< -o $(@) @@\ */ < /*[$(<) -o $(@)] works on mercury, not on saturn!-RJL050807] */ < /* empty rule to cancel default rule: */ < < /* (*) does not include .c in CC command */ < /* Pattern rule for gnu make only: don't forget '/': */ < /* Didn't work on mercury: < * $(CC)...$(PRDIR)/%.c -o $(PROBJDIR)/%.o @@\ < * $(PRDIR)/%.c not found < * $(CC) ... $(<).c -o $(@) < * ($(PROBJDIR)/%.c not found - wrong dir'y) < * $(CC) -g -c -Wall $( --- > # Makefile generated from "Imake.tmpl" and 113c113 < CURRENT_DIR = ./pr_util_log --- > CURRENT_DIR = ./pr_util_nolog 816a817,819 > # > # > 819c822 < BDEUSERDEFINES = -DDEBUG -DString_REDEFINE_NOT_NEEDED -DBDELOG -DBDE_SCHEMA="94sbde_schema.h" -DBDE_VIEW="94sbdeview" --- > BDEUSERDEFINES = -DDEBUG -DString_REDEFINE_NOT_NEEDED -DBDE_SCHEMA="94sbde_schema.h" -DBDE_VIEW="94sbdeview" 825c828 < PRDIR = $(TOP)/pr_util_log --- > PRDIR = $(TOP)/pr_util_nolog 835c838 < INCLUDES = -I/usr/include -I$(TOPINCLUDE) -I$(SCHEMA_INCLUDE) -I$(TOP) --- > INCLUDES = -I/usr/include -I$(TOP) -I$(TOPINCLUDE) -I$(SCHEMA_INCLUDE) 837c840 < GENFLAGS = -metafile -log --- > GENFLAGS = -metafile 839c842 < GENSRCS = $(PRDIR)/pr_load.c $(PRDIR)/pr_free.c $(PRDIR)/pr_dump.c $(PRDIR)/pr_delete.c $(PRDIR)/pr_log.c $(PRDIR)/pr_stats.c $(PRDIR)/pr_accessors.c $(PRDIR)/lut.c $(PRDIR)/dprint.c --- > GENSRCS = $(PRDIR)/pr_load.c $(PRDIR)/pr_free.c $(PRDIR)/pr_dump.c $(PRDIR)/pr_delete.c $(PRDIR)/pr_stats.c $(PRDIR)/pr_accessors.c $(PRDIR)/lut.c $(PRDIR)/dprint.c 841c844 < GENOBJS = $(PROBJDIR)/pr_load.o $(PROBJDIR)/pr_free.o $(PROBJDIR)/pr_dump.o $(PROBJDIR)/pr_delete.o $(PROBJDIR)/pr_log.o $(PROBJDIR)/pr_stats.o $(PROBJDIR)/pr_accessors.o $(PROBJDIR)/lut.o $(PROBJDIR)/dprint.o --- > GENOBJS = $(PROBJDIR)/pr_load.o $(PROBJDIR)/pr_free.o $(PROBJDIR)/pr_dump.o $(PROBJDIR)/pr_delete.o $(PROBJDIR)/pr_stats.o $(PROBJDIR)/pr_accessors.o $(PROBJDIR)/lut.o $(PROBJDIR)/dprint.o diff -bitw pr_util_log/Makefile.bak pr_util_nolog/Makefile.bak 5c5 < # Makefile generated from "Imake.tmpl" and --- > # Makefile generated from "Imake.tmpl" and 113c113 < CURRENT_DIR = ./pr_util_log --- > CURRENT_DIR = ./pr_util_nolog 816a817,819 > # > # > 819c822 < BDEUSERDEFINES = -DDEBUG -DString_REDEFINE_NOT_NEEDED -DBDELOG -DBDE_SCHEMA="94sbde_schema.h" -DBDE_VIEW="94sbdeview" --- > BDEUSERDEFINES = -DDEBUG -DString_REDEFINE_NOT_NEEDED -DBDE_SCHEMA="94sbde_schema.h" -DBDE_VIEW="94sbdeview" 825c828 < PRDIR = $(TOP)/pr_util_log --- > PRDIR = $(TOP)/pr_util_nolog 835c838 < INCLUDES = -I/usr/include -I$(TOPINCLUDE) -I$(SCHEMA_INCLUDE) -I$(TOP) --- > INCLUDES = -I/usr/include -I$(TOP) -I$(TOPINCLUDE) -I$(SCHEMA_INCLUDE) 837c840 < GENFLAGS = -metafile -log --- > GENFLAGS = -metafile 839c842 < GENSRCS = $(PRDIR)/pr_load.c $(PRDIR)/pr_free.c $(PRDIR)/pr_dump.c $(PRDIR)/pr_delete.c $(PRDIR)/pr_log.c $(PRDIR)/pr_stats.c $(PRDIR)/pr_accessors.c $(PRDIR)/lut.c $(PRDIR)/dprint.c --- > GENSRCS = $(PRDIR)/pr_load.c $(PRDIR)/pr_free.c $(PRDIR)/pr_dump.c $(PRDIR)/pr_delete.c $(PRDIR)/pr_stats.c $(PRDIR)/pr_accessors.c $(PRDIR)/lut.c $(PRDIR)/dprint.c 841c844 < GENOBJS = $(PROBJDIR)/pr_load.o $(PROBJDIR)/pr_free.o $(PROBJDIR)/pr_dump.o $(PROBJDIR)/pr_delete.o $(PROBJDIR)/pr_log.o $(PROBJDIR)/pr_stats.o $(PROBJDIR)/pr_accessors.o $(PROBJDIR)/lut.o $(PROBJDIR)/dprint.o --- > GENOBJS = $(PROBJDIR)/pr_load.o $(PROBJDIR)/pr_free.o $(PROBJDIR)/pr_dump.o $(PROBJDIR)/pr_delete.o $(PROBJDIR)/pr_stats.o $(PROBJDIR)/pr_accessors.o $(PROBJDIR)/lut.o $(PROBJDIR)/dprint.o Only in pr_util_log: MakefileLog_alpha Only in pr_util_log: MakefileLog_i386-linux Only in pr_util_nolog: MakefileNolog_alpha Only in pr_util_nolog: MakefileNolog_i386-linux Only in pr_util_log: a.out Common subdirectories: pr_util_log/alpha and pr_util_nolog/alpha Only in pr_util_log: bde Only in pr_util_nolog: bdemake051126.0228 Only in pr_util_log: cc_pr_load060202.1137 Only in pr_util_nolog: cvsdiff_prutilnolog.051211 Only in pr_util_nolog: cvsdiffpr_utilFromchgen13.051105.txt Only in pr_util_nolog: datetest.csh Only in pr_util_log: gcc_pr_load060202.1138 Common subdirectories: pr_util_log/i386-linux and pr_util_nolog/i386-linux Only in pr_util_nolog: libname diff -bitw pr_util_log/lut.c pr_util_nolog/lut.c 10,15c10 < /********************************************************** < * $Log: lut.c,v $ < * Revision 1.2 2005/10/23 21:23:09 lechner < * Added $Log comment to insert cvs rev. comments. < * < **********************************************************/ --- > diff -bitw pr_util_log/lut.h pr_util_nolog/lut.h 7,13d6 < /********************************************************** < * $Log: lut.h,v $ < * Revision 1.2 2005/10/23 21:23:11 lechner < * Added $Log comment to insert cvs rev. comments. < * < **********************************************************/ < Only in pr_util_nolog: makepr_util_nologANDbde051126.0059 diff -bitw pr_util_log/newprfiles050812.dif pr_util_nolog/newprfiles050812.dif 1,15c1,12 < newprfiles050812.dif - RJL050812 < < THisshows that bde/pr_util has changes not yet produced by chgen13, < which are needed in chgen/src to update the files < 9*.h, pr_accessors.c pr_delete.c, pr_dump.c, pr_load.c: < ============================================ < < saturn.cs.uml.edu(140)> diff prfiles.050812:*|grepdiff > newprfiles050812.dif < ------------------------------------- < 1:diff -bitw prfiles.050812:1432/94sbde_schema.h prfiles.050812:1435/94sbde_schema.h < 96:diff -bitw prfiles.050812:1432/pr_accessors.c prfiles.050812:1435/pr_accessors.c < 185:diff -bitw prfiles.050812:1432/pr_delete.c prfiles.050812:1435/pr_delete.c < 193:diff -bitw prfiles.050812:1432/pr_dump.c prfiles.050812:1435/pr_dump.c < 208:diff -bitw prfiles.050812:1432/pr_load.c prfiles.050812:1435/pr_load.c < 483:= wc --- > $PRNLOG/newprfileso50812.dif > ----------------------- > saturn.cs.uml.edu(128)> diff prfiles.050812:* | grepdiff > 1:diff -bitw prfiles.050812:1430/94sbde_schema.h prfiles.050812:1435/94sbde_schema.h > 96:Only in prfiles.050812:1430: Imakefile > 97:diff -bitw prfiles.050812:1430/pr_accessors.c prfiles.050812:1435/pr_accessors.c > 186:diff -bitw prfiles.050812:1430/pr_delete.c prfiles.050812:1435/pr_delete.c > 194:diff -bitw prfiles.050812:1430/pr_dump.c prfiles.050812:1435/pr_dump.c > 209:diff -bitw prfiles.050812:1430/pr_load.c prfiles.050812:1435/pr_load.c > saturn.cs.uml.edu(129)> diff prfiles.050812:* | wc > 486 2652 19487 > ===================================================== 17,19c14 < saturn.cs.uml.edu(143)> diff prfiles.050812:* >> newprfiles050812.dif < ---------------------- < diff -bitw prfiles.050812:1432/94sbde_schema.h prfiles.050812:1435/94sbde_schema.h --- > diff -bitw prfiles.050812:1430/94sbde_schema.h prfiles.050812:1435/94sbde_schema.h 113a109 > Only in prfiles.050812:1430: Imakefile 117c113 < diff -bitw prfiles.050812:1432/pr_accessors.c prfiles.050812:1435/pr_accessors.c --- > diff -bitw prfiles.050812:1430/pr_accessors.c prfiles.050812:1435/pr_accessors.c 205c201 < < #endif < < #endif 207c203 < ====================================================== --- > ================================================== 209c205 < diff -bitw prfiles.050812:1432/pr_delete.c prfiles.050812:1435/pr_delete.c --- > diff -bitw prfiles.050812:1430/pr_delete.c prfiles.050812:1435/pr_delete.c 218c214 < ======================================================= --- > ========================================================= 220c216 < diff -bitw prfiles.050812:1432/pr_dump.c prfiles.050812:1435/pr_dump.c --- > diff -bitw prfiles.050812:1430/pr_dump.c prfiles.050812:1435/pr_dump.c 236c232 < ================================================== --- > =================================================== 238c234 < diff -bitw prfiles.050812:1432/pr_load.c prfiles.050812:1435/pr_load.c --- > diff -bitw prfiles.050812:1430/pr_load.c prfiles.050812:1435/pr_load.c 460c456,458 < 2017c2025 --- > 2010a2019 > > > 2016c2025 464c462 < 2049,2083d2056 --- > 2048,2082d2056 500c498 < 2085,2097d2057 --- > 2084,2096d2057 Common subdirectories: pr_util_log/oldImakefiles and pr_util_nolog/oldImakefiles Only in pr_util_nolog: oldMakefiles Common subdirectories: pr_util_log/old_prfiles and pr_util_nolog/old_prfiles diff -bitw pr_util_log/pr_delete.c pr_util_nolog/pr_delete.c 131,134d130 < char log_text[BUFSIZE]; < < logwait(); < 143,148d138 < < /* The following is to support logging */ < decode(temp_key, &FOcurr->FOid); < sprintf(log_text,"DL %s\n",temp_key); < logstr(log_text); < 157,162d146 < < /* The following is to support logging */ < decode(temp_key, &GDcurr->GDid); < sprintf(log_text,"DL %s\n",temp_key); < logstr(log_text); < 173,178d156 < < /* The following is to support logging */ < decode(temp_key, &HGcurr->HGid); < sprintf(log_text,"DL %s\n",temp_key); < logstr(log_text); < 191,196d168 < < /* The following is to support logging */ < decode(temp_key, &HNcurr->HNid); < sprintf(log_text,"DL %s\n",temp_key); < logstr(log_text); < 206,211d177 < < /* The following is to support logging */ < decode(temp_key, &HAcurr->HAid); < sprintf(log_text,"DL %s\n",temp_key); < logstr(log_text); < 224,229d189 < < /* The following is to support logging */ < decode(temp_key, &HLcurr->HLid); < sprintf(log_text,"DL %s\n",temp_key); < logstr(log_text); < 239,244d198 < < /* The following is to support logging */ < decode(temp_key, &HPcurr->HPid); < sprintf(log_text,"DL %s\n",temp_key); < logstr(log_text); < 254,259d207 < < /* The following is to support logging */ < decode(temp_key, &HIcurr->HIid); < sprintf(log_text,"DL %s\n",temp_key); < logstr(log_text); < 270,275d217 < < /* The following is to support logging */ < decode(temp_key, &CGcurr->CGid); < sprintf(log_text,"DL %s\n",temp_key); < logstr(log_text); < 285,290d226 < < /* The following is to support logging */ < decode(temp_key, &GXcurr->GXid); < sprintf(log_text,"DL %s\n",temp_key); < logstr(log_text); < diff -bitw pr_util_log/pr_dump.c pr_util_nolog/pr_dump.c 20d19 < char dumpkey[3][HCG_KEY_SIZE+1]; /* used in dump_row */ 25c24 < char dumpkey[3][HCG_KEY_SIZE+1]; /* up to 3 pfkeys, used in dump_row */ --- > char dumpkey[3][HCG_KEY_SIZE+1]; /* 3 keys, used in dump_row */ 30d28 < FILE* dump_fp; /* Moved to file scope - RJL060120 */ 31a30 > FILE* dump_fp; /* Moved to file scope - RJL060120 */ 49a49,53 > /* #define PrintCheck(x) if((x) == -1) { printf(\ > "Error in outputing file. Exiting\n "); exit(1);} > PrintCheck checks fprintf return for success, else error exits. > */ > 57c61 < {EP; --- > 58a63 > {EP; 82d86 < 168,169c172,173 < } /* end if rcount > 0*/ < } /* end for each table (hcg_tbk_idx++) */ --- > } /* end if ... rcount>0*/ > } /* end for each table (hcg_tbl_idx++) */ 171,173c175 < // man fclose: Upon successful completion, fclose() etc. < // return a value of 0 (zero). < // Otherwise, EOF is returned, and errno is set to indicate the error. --- > /* fclose return a value of 0 (zero), or returns EOF and sets errno. */ 175,176c177,179 < printf("\n\nERROR %d: pr_dump File failed to close filename %s: abort!\n\n",errno, file_name); < exit(0); --- > printf("\n\nERRNO=%d: pr_dump File failed to close filename %s: abort!\n\n", > errno, file_name); > LP;exit(0); 180a184,185 > > 198a204,207 > /* pr_dump.c from gencpp could generate XXcurr->XXdump_row and call it in this switch.*/ > /* decode asserts arg2 != 0 which fails after constructing HG, CG, GX in fileio.cc */ > /* hcg_update_version and decode could be template-based from gencpp -RJL060114 */ > 202c211 < EP; --- > EP; // crashed in decode - inside encoding? 207a217 > 210a221,223 > > //Added default case for out-of-range idx = encoding(tbl, )=0 - RJL0060129 > //dump_row crashes on idx = decode(tbl,,,); made error return -1. - RJL060120 212c225 < switch(idx) { /* '{' added; multiple switch(idx) prefixes removed-RJL060120 */ --- > switch(idx) { /* '{' added 060121 - multiple switch(idx) prefixes removed - RJL060120 */ 230a244 > DP;fprintf(stderr, "HGcurr->HGid = %ux\n", HGcurr->HGid); 306,307c320,321 < printf("dump_row: Illegal table type for case %d: no-op\n", idx); < fprintf(dump_fp, "//dump_row: Illegal table type for case %d: no-op\n",idx); --- > printf("dump_row: Illegal table type %s case %d: no-op\n", tbl, idx); > fprintf(dump_fp, "//dump_row: Illegal table type %s case %d: no-op\n", tbl, idx); diff -bitw pr_util_log/pr_free.c pr_util_nolog/pr_free.c 36,37d35 < logwait(); /* not in pr_util_nolog */ < logstr("FR\n"); /* not in pr_util_nolog */ Only in pr_util_log: pr_load.Epacked.c Only in pr_util_log: pr_load.Epacked.c.errorlog060202.2359 Only in pr_util_log: pr_load.Epacked.errorlog060202.2305 Only in pr_util_log: pr_load.Epacked.errorlog060203.0037 diff -bitw pr_util_log/pr_load.c pr_util_nolog/pr_load.c 137d136 < 413c412 < * If fails, sets ver = empty string and returns -1 --- > * If fails, sets ver = empty string and returns -1. 419c418 < if( key_len == OLD_KEY_LEN ) --- > if( key_len == OLD_KEY_LEN ) /* 2+2+4 bytes */ 424c423 < else if( key_len == NEW_KEY_LEN ) --- > else if( key_len == NEW_KEY_LEN ) /* 4+3+5 bytes */ 443c442 < if( key_len == OLD_KEY_LEN ) --- > if( key_len == OLD_KEY_LEN ) /* 2+2+4 bytes */ 447c446 < else if( key_len == NEW_KEY_LEN ) --- > else if( key_len == NEW_KEY_LEN ) /* 4+3+5 bytes */ 460a460 > * - RJL 040521 585,586c585,586 < * Returns NULL ptr if failure. WARNING: Not re-entrant: extrnal_key is corrupted. < * Calls decode() to set external_key and return 1, else return -1. --- > * Returns NULL ptr if failure. > * Calls decode() to set external_key and return +/-1 592c592 < EP;LP;return (( (status = decode(external_key,k)) == 1 ) ? external_key : NULL); --- > return ( (status = decode(external_key,k)) == 1 ) ? external_key : NULL; 596,598c596,597 < * Decode the encoded key k, put key_string or '\0' into *external_key array < * Calls abb_decode, ver_decode, row_decode; expects external_key[KEY_SIZE+1]; < * Clients: decode_retstr + others. --- > * Decode the encoded key k, return key_string or empty *external_key > * Calls abb_decode, ver_decode, row_decode 602a602 > char t[10]; 604,610c604,605 < char t[HCG_KEY_SIZE+1] = ""; < assert(t[0] = '\0'); < strncpy_null(external_key, t, HCG_KEY_SIZE+1); /* static in decode_rtnstr(); */ < if (k == 0) < { < LP;return -1; < } --- > external_key[0] = '\0'; > if (k == 0) return -1; /* assert !=0 failed 0512, 0601 -RJL */ 613c608 < LP;return -1; --- > return -1; 618c613 < if( ((klen = strlen(t)) != OLD_ABB_LEN) && (klen != NEW_ABB_LEN) ) --- > if( (klen != OLD_ABB_LEN) && (klen != NEW_ABB_LEN) ) 621c616 < LP;return -1; --- > return -1; 625c620 < strcat( external_key, t ); --- > strcat( external_key, t ); /*tttype*/ 628c623 < LP;return -1; --- > return -1; 632c627 < strcat( external_key, t ); --- > strcat( external_key, t ); /* ttyp+ver*/ 635c630 < LP;return -1; --- > return -1; 638c633 < { --- > { /*ttyp+ver+row*/ 640c635,636 < LP;return 1; --- > assert(strlen(external_key)<10); > return 1; 645c641 < } /* end decode */ --- > } // end decode 651,654c647,650 < {EP; < if( *(unsigned long*)k1 < *(unsigned long*)k2 ) {LP;return -1;}; < if( *(unsigned long*)k1 == *(unsigned long*)k2 ){LP;return 0;} < else { LP;return 1;} --- > { > if( *(unsigned long*)k1 < *(unsigned long*)k2 ) return -1; > if( *(unsigned long*)k1 == *(unsigned long*)k2 ) return 0; > else return 1; 751d746 < 752a748 > 765c761 < void pr_init ( char *viewdef_filename, char *filelist) /* (760-1137)*/ --- > void pr_init ( char *viewdef_filename, char *filelist) /* 752-1065 */ 781,783d776 < /* Genlog - 5/7/96: log call to pr_init */ < char log_text[BUFSIZE]; < FILE *logdata_fp; 785,795d777 < if (hcg_log) < { < printf("Warning: pr_init() called during log session"); < printf("may cause unexpected results.\n"); < } < logwait(); < sprintf(log_text, "IN %s %s\n", viewdef_filename, filelist); < logstr(log_text); < < /* End Genlog addition */ < 801c783 < /*in lut.c, abbr_lut_create calls lut_init(p_lut, ABBR_TBL_TYPE); -RJL051127 */ --- > /*in lut.c, bbr_lut_create calls lut_init(p_lut, ABBR_TBL_TYPE); -RJL051127 */ 813,825d794 < /* Added by Genlog 5/7/96 */ < /* For the capture of datafile [logging info?] if NOT in replay session */ < /* THE INTENT OF THIS IS UNCLEAR TO ME - RJL 031019 */ < /* if (hcg_log != 2) { */ /* why not if(hcg_log == 1) (logging has been activated)?*/ < if (hcg_log == 1) { /* try to open a file for LATER replay - RJL 040425 */ < if ((logdata_fp = fopen("logdata.txt", "w")) == NULL) { < printf("pr_init(): can not open logdata.txt to WRITE the log data\n"); < exit(2); /* is it safe for pr_init to preserve hcg_log = 1? */ < < } < } < /* End Genlog Addition*/ < 884,890d852 < /* Added by Genlog 5/7/96 to log pr_init */ < /* if (hcg_log != 2) */ < < if (hcg_log == 1) /*logging is on: add Keyword+filename to logdata_fp*/ < // fprintf(logdata_fp, "LogDataFile %s\n", localptr);/* localptr added 040602 -RJL */ < /* End Genlog Addition */ < 896,899d857 < /* Added by Genlog 5/7/96 to log table rows [to be] copied to logdata_fp file */ < if (hcg_log == 1) /* was != 2 (not in replay) - RJL 040622 */ < fprintf(logdata_fp, "%s\n",hcg_buffer); < /* End Genlog Addition */ 928c886 < LP;exit(0); /* exit closes (hcg_ascii_fp)? */ --- > exit(0); /* exit closes (hcg_ascii_fp)? */ 938,939c896,898 < /* dprintdd("hcg_row = %d, hcg_version = %d in ", < hcg_row, hcg_version);DP; newline in DP */ --- > /*dprintdd("hcg_row = %d, hcg_version = %d ", > hcg_row, hcg_version);DP; > */ 949c908 < /* dprintdd("New maxver = %d from key %x\n", hcg_version, hcg_k);*/ --- > //dprintdd("New maxver = %d from key %x\n", hcg_version, hcg_k); 952c911 < } /* while (!feof(hcg_ascii_fp))*/ --- > } /* end while (!feof(hcg_ascii_fp))*/ 960,987d918 < if (hcg_log == 1) /* added 040622 - RJL */ < fclose(logdata_fp); /* done copying infiles */ < < /* Added by Genlog 5/7/96 to log pr_init */ < /* if (hcg_log != 2) why? = RK: 04042only 5 - crashed bde below - RJL 040530 */ < /* if (hcg_log == 1) */ < /* This crashed bde 040530:1150 - RJL: */ < /* End Genlog Addition */ < /* filelist is effectively consumed by now. */ < < /*===================read viewdefs===============================*/ < /* shouldn't this have been done earlier ? - RJL 040622 */ < /* (maybe not if scan filelist gets pkey ranges BEFORE pr_load is called?) */ < /* Open viewdef_filename to load view defs : < * filename = *.viewdefs; < * file format: < * These should be 2 meta-schema table types ([DV]---<[VE]) - RJL 040615 < * define_view 94sbdedefaultsView read < * view_element 94sbdedefaultsView GD 0 < * ... < * define_view 94sbdeview update (All highest versions for update) < * view_element 94sbdeview HG 0 < * ... < * NOTE: viewnames MUST be declared before their resp[ective view_elements. < * BUT: view_elements need NOT be placed directly under their define_View parent. < * E.g., ALL viewnames may be declared before ANY view elements < * (due to the redundant viewname prefix to each view_elelement line).- RJL 040622 < */ 1143c1074 < }/* end pr_init (760-1137)*/ --- > LP;}/* end pr_init (log:1592:1922)(nolog:752-1065) */ 1263c1194 < /* children. Pre-condition: pa##elt is a valid (pa*) ptr. */ --- > /* children. */ 1273c1204 < ca##curr2->p##_fpp = (struct dummy_type*) pa##curr; \ --- > (struct pa *) ca##curr2->p##_fpp = pa##curr; \ 1280,1284c1211,1213 < for ( ca##temp2 = pa##curr->c##_fcp; \ < ca##temp2->p##_fpp != (struct dummy_type*)pa##curr; \ < ca##temp2 = (struct ca *)(ca##temp2->p##_fpp) ) /*no-op*/; \ < ca##temp2->p##_fpp = (struct dummy_type*)ca##curr2; \ < }; \ --- > for (ca##temp2 = pa##curr->c##_fcp; (struct pa *) ca##temp2->p##_fpp != pa##curr; ca##temp2 = (struct ca *)ca##temp2->p##_fpp); \ > (struct ca *) ca##temp2->p##_fpp = ca##curr2; \ > } \ 1296,1299c1225 < for (pa##curr2 = pa; \ < (pa##curr2 != NULL) && (key_compare(&pa##curr2->pk,&ca##curr->cf) < 0); \ < pa##curr2 = pa##curr2->next_ptr;\ < ) /*no-op*/; \ --- > for (pa##curr2 = pa; (pa##curr2 != NULL) && (key_compare(&pa##curr2->pk,&ca##curr->cf) < 0); pa##curr2 = pa##curr2->next_ptr); \ 1306c1232 < /*****************************************************************************/ --- > /******************************************************************************/ 1316c1242 < /* calls to link_child_[no}bp are included in the caller (pr_add). */ --- > /* calls to link_child_{no}bp are included in the caller (pr_add). */ 1318a1245 > /* */ 1320a1248,1249 > for (pa##curr2 = pa; (pa##curr2 != NULL) && (key_compare(&pa##curr2->pk,&ca##curr->cf) < 0); pa##curr2 = pa##curr2->next_ptr); \ > if ((pa##curr2 != NULL) && (key_compare(&ca##curr->cf,&pa##curr2->pk) == 0)) \ 1322,1327c1251,1252 < for( pa##curr2 = pa; \ < pa##curr2 != NULL && key_compare(&pa##curr2->pk, &ca##curr->cf) < 0; \ < pa##curr2 = pa##curr2->next_ptr \ < ) /* no-op */ ; \ < if (pa##curr2 != NULL && key_compare(&ca##curr->cf,&pa##curr2->pk) == 0 ) \ < { \ --- > ca##curr->p##_pp = pa##curr2; \ > /*(struct pa *) ca##curr->p##_fpp = pa##curr2;*/ \ 1334,1338c1259,1261 < ca##temp2->p##_fpp != (struct dummy_type*)pa##curr2; \ < ca##temp2 = (struct ca*)(ca##temp2->p##_fpp) \ < ) /*no-op*/ ; \ < ca##temp2->p##_fpp = (struct dummy_type*)ca##curr; \ < } \ --- > (struct pa*) ca##temp2->p##_fpp != pa##curr2; \ > ca##temp2 = (struct ca *)ca##temp2->p##_fpp); \ > /*(struct ca *)*/ ca##temp2->p##_fpp = (struct dummy_type*) ca##curr; \ 1341d1263 < /* end macro link_parent_nobp_m */ 1343c1265 < /*********************** (1350-1418) *********************************/ --- > /******************************************************************************/ 1346c1268 < /* expanded first call to link_parent_nobp_m(HN, HG,...) line 1379 to 17 lines */ --- > 1367c1289 < case 3 : /* encoding of HN (1374:1380) */ --- > case 3 : /* encoding of HN */ 1411c1333 < } /* end pr_link ( :1418)*/ --- > } /* end pr_link */ 1416c1338 < /* pre-cond: size is not largr than int */ --- > 1424,1427d1345 < /******************************************************************************/ < /* This macro is used to generate the next available primary key value for the*/ < /* specified table, using the specified view. */ < /******************************************************************************/ 1428a1347,1352 > /************************************************************************/ > /* Macro pr_gen_key composes the next available primary key value */ > /* for the specified table, from its last 3 params. */ > /* When pr_gen_pkey calls pr_gen_key, it insures tbl_abbrv is in viewname.*/ > /* When pr_check_fkey calls pr_gen_key, fkeys default to version = row = 0.*/ > /************************************************************************/ 1435a1360 > 1438c1363 < /* gets args from hcg_* structs and calls pr_gen_key to update pkey; */ --- > /* gets args from hcg_* structs and calls pr_gen_key to concat pkey parts; */ 1458c1383 < /* pr_check_fkey modified: print 32bit unsigned fkey as hex */ --- > /* pr_check_fkey modified: compose and print 32bit unsigned fkey as hex */ 1478c1403 < /******************************************************************************/ --- > /************************************************************************/ 1482c1407 < /******************************************************************************/ --- > /************************************************************************/ 1489c1414 < " Warning: null %s.%s : expanded to at most '???' for pkey %ux\n", \ --- > " Warning: null %s.%s : expanded to at most '?^ for pkey %ux\n", \ 1498,1645d1422 < < /*************************************************************************/ < /* Function : log_pr_add */ < /* */ < /* Abstract : This function is used to log a pr_add transaction */ < /* The tbl indicates which table is having a row added. */ < /* tbl_ptr points to the record to be added. */ < /**************************************************************************/ < /* TBD: Define a macro for all these cases. No need for repetitious code */ < /* Pre-condition: hcg_log == 1 */ < /* Pre-condition: exists FILE* hcg_logfileptr open for output */ < /* Pre-cond failed 040712: pr_startlog was not called to open it */ < < //New state model for logging/replay - RJL 040712; (not tested for state 3 yet) < // See preamble to pr_load.c; do log_pr_add iff (hcg_log) < < void log_pr_add (char *tbl, char *viewname, hcg_ptr tbl_ptr) < { < FILE* hcg_logfileptr; // pre-cond: already open (by startllog?)- RJL 040708 < char outkey[3][HCG_KEY_SIZE+1]; // updated by decode(outkey[j], anykeyfield) < int idx; < EP; < /* pre-condition: logging is turned on by startlog(); */ < //assert(hcg_log); /* failed 040713.0130 - RJL 040713 */ < if (!hcg_log) { < dprint("WARNING: log_pr_add call with hcg_log = 0, ignored.\n"); < return; < } < < assert(find_tbl_idx(tbl)); /* alters tbl##curr; exit if NULL */ < if (hcg_log){ < < idx = hcg_tbl_idx; < < /* Write to hcg_logfile based on idx */ < /* TBD: make this a switch on idx = enumerated ttabbrev symbols */ < if (idx==0) < { < FOcurr=(struct FO *) tbl_ptr; < hcg_update_version(&FOcurr->FOid,FO_idx,0); < decode(outkey[0], &FOcurr->FOid); < PrintCheck(fprintf(hcg_logfileptr, < " %-8s %-50s %-50s %-2s %-15s\n", < outkey[0], FOcurr->xfont, FOcurr->psfontname, < FOcurr->psfontsize, FOcurr->bdefont)); < } < if (idx==1) < { < GDcurr=(struct GD *) tbl_ptr; < hcg_update_version(&GDcurr->GDid,GD_idx,0); < decode(outkey[0], &GDcurr->GDid); < PrintCheck(fprintf(hcg_logfileptr, < " %-8s %-10s %8.4f %8.4f %-4s %-25s %-10s %-10s %8.4f %8.4f\n", < outkey[0], GDcurr->shape, GDcurr->width, GDcurr->height, < GDcurr->hsegpattern, GDcurr->txtfont, GDcurr->location, < GDcurr->justify, GDcurr->gcwidth, GDcurr->gcheight)); < } < if (idx==2) < { < HGcurr=(struct HG *) tbl_ptr; < hcg_update_version(&HGcurr->HGid,HG_idx,0); < decode(outkey[0], &HGcurr->HGid); < PrintCheck(fprintf(hcg_logfileptr, " %-8s %-8s %-8s %-12s %-12s %-12s %-60s\n" < , outkey[0], HGcurr->FSid, HGcurr->HNid, HGcurr->HGauthor, HGcurr->HGcreated, HGcurr->HGlastmod < , HGcurr->HGtitle)); < } < if (idx==3) < { < HNcurr=(struct HN *) tbl_ptr; < hcg_update_version(&HNcurr->HNid,HN_idx,0); < decode(outkey[0], &HNcurr->HNid); < hcg_update_version(&HNcurr->HGid,HG_idx,0); < decode(outkey[1], &HNcurr->HGid); < PrintCheck(fprintf(hcg_logfileptr, " %-8s %-8s %-8s %-1s %8.4f %8.4f %8.4f %8.4f %-25s %8.4f %8.4f %8d %8d %-20s\n" < , outkey[0], outkey[1], HNcurr->FSid, HNcurr->shape, HNcurr->centerx, HNcurr->centery < , HNcurr->width, HNcurr->height, HNcurr->txtfont, HNcurr->txtoffsetx, HNcurr->txtoffsety, HNcurr->txtwidth < , HNcurr->txtheight, HNcurr->nodename)); < } < if (idx==4) < { < HAcurr=(struct HA *) tbl_ptr; < hcg_update_version(&HAcurr->HAid,HA_idx,0); < decode(outkey[0], &HAcurr->HAid); < hcg_update_version(&HAcurr->HNid,HN_idx,0); < decode(outkey[1], &HAcurr->HNid); < PrintCheck(fprintf(hcg_logfileptr, " %-8s %-8s %-8s %8.4f %8.4f %8.4f %8d %8d %-25s %-60s\n" < , outkey[0], outkey[1], HAcurr->DAid, HAcurr->txtoffsetx, HAcurr->txtoffsety, HAcurr->HAorigin < , HAcurr->txtwidth, HAcurr->txtheight, HAcurr->txtfont, HAcurr->hlabel)); < } < if (idx==5) < { < HLcurr=(struct HL *) tbl_ptr; < hcg_update_version(&HLcurr->HLid,HL_idx,0); < decode(outkey[0], &HLcurr->HLid); < hcg_update_version(&HLcurr->HNid1,HN_idx,0); < decode(outkey[1], &HLcurr->HNid1); < hcg_update_version(&HLcurr->HNid2,HN_idx,0); < decode(outkey[2], &HLcurr->HNid2); < PrintCheck(fprintf(hcg_logfileptr, " %-8s %-8s %-8s %8d %8d\n" < , outkey[0], outkey[1], outkey[2], HLcurr->HPcount, HLcurr->allvisible)); < } < if (idx==6) < { < HPcurr=(struct HP *) tbl_ptr; < hcg_update_version(&HPcurr->HPid,HP_idx,0); < decode(outkey[0], &HPcurr->HPid); < hcg_update_version(&HPcurr->HLid,HL_idx,0); < decode(outkey[1], &HPcurr->HLid); < PrintCheck(fprintf(hcg_logfileptr, " %-8s %-8s %8.4f %8.4f %8d %-4s\n" < , outkey[0], outkey[1], HPcurr->HPx, HPcurr->HPy, HPcurr->is_visible, HPcurr->hsegpattern)); < } < if (idx==7) < { < HIcurr=(struct HI *) tbl_ptr; < hcg_update_version(&HIcurr->HIid,HI_idx,0); < decode(outkey[0], &HIcurr->HIid); < hcg_update_version(&HIcurr->HLid,HL_idx,0); < decode(outkey[1], &HIcurr->HLid); < PrintCheck(fprintf(hcg_logfileptr, " %-8s %-8s %-8s %8.4f %8.4f %8.4f %8d %8d %-25s %-40s\n" < , outkey[0], outkey[1], HIcurr->DIid, HIcurr->HIorigin, HIcurr->tbeginx, HIcurr->tbeginy < , HIcurr->txtwidth, HIcurr->txtheight, HIcurr->txtfont, HIcurr->hlabel)); < } < if (idx==8) < { < CGcurr=(struct CG *) tbl_ptr; < hcg_update_version(&CGcurr->CGid,CG_idx,0); < decode(outkey[0], &CGcurr->CGid); < hcg_update_version(&CGcurr->HGid,HG_idx,0); < decode(outkey[1], &CGcurr->HGid); < PrintCheck(fprintf(hcg_logfileptr, " %-8s %-8s %8.4f %8.4f %8.4f %8.4f\n" < , outkey[0], outkey[1], CGcurr->CGcenterx, CGcurr->CGcentery, CGcurr->CGwidth, CGcurr->CGheight)); < } < if (idx==9) < { < GXcurr=(struct GX *) tbl_ptr; < hcg_update_version(&GXcurr->GXid,GX_idx,0); < decode(outkey[0], &GXcurr->GXid); < hcg_update_version(&GXcurr->CGid,CG_idx,0); < decode(outkey[1], &GXcurr->CGid); < PrintCheck(fprintf(hcg_logfileptr, " %-8s %-8s %-8s %8.4f %-25s %8.4f %8.4f %8d %8d %-128s\n" < , outkey[0], outkey[1], GXcurr->DAid, GXcurr->GXorigin, GXcurr->txtfont, GXcurr->txtoffsetx < , GXcurr->txtoffsety, GXcurr->txtwidth, GXcurr->txtheight, GXcurr->grphcaption)); < } < } /* end if hcg_log */ < } /* end log_pr_add */ < < /* end of gen_pr_add output to pr_load.c */ < 1652d1428 < /* else ??? -RJL060121 */ 1656,1657d1431 < #define TTPRNT dprint("tbl_encoding [0..9] = FO,GD,HG,HN,HA,HL,HP,HI,CG,GX\n") < 1659a1434 > #define TTPRNT dprint("tbl_encoding [0..9] = FO,GD,HG,HN,HA,HL,HP,HI,CG,GX\n") 1660a1436 > /*char tempkey[HCG_KEY_SIZE+1];*/ 1663d1438 < char VNstring[NAMELENGTH] = "VN "; /* TBD: ViewName: string or table? */ 1665,1668c1440,1443 < /* skip leading spaces (if any) from tbl_abbrv */ < < while( *tbl_abbrv == ' ') ++tbl_abbrv; < --- > /* skip leading whitespace (if any) from tbl_abbrv */ > /* (\t added 060126; was ++tbl_abbrv until 060126 - RJL*/ > while( *tbl_abbrv == ' '||*tbl_abbrv== '\t') tbl_abbrv++; > assert(strlen(tbl_abbrv) == HCG_ABBR_SIZE); //2 or 4 - RJL060126 1673,1674c1448 < /*log_pr_add(tbl_abbrv, viewname, tbl_ptr); */ < return; --- > LP;return; 1679,1680c1453 < /*log_pr_add (tbl_abbrv, viewname, tbl_ptr); */ < return; --- > LP;return; 1685,1687c1458,1459 < printf("Warning: unknown table (%s) passed to pr_add, ignored.\n",error_table); < /*log_pr_add (tbl_abbrv, viewname, tbl_ptr); */ < return; --- > printf("Warning: unknown table (%s) passed to [do_]pr_add, ignored.\n",error_table); > LP;return; 1690c1462,1464 < return; --- > { > LP;return; /* Why no error msg- tblabbrv not in view?? - RJL060126 */ > } 1695d1468 < 1702d1474 < DP; assert(strlen(viewname)>0); 1704c1476,1478 < { --- > {/* TBD: make these class methods when gencpp makes XX a class:*/ > /* E.g.: call class method FO::do_add(fld_val_lIst) for case#0.*/ > /* Pre-cond: pr_create did tbl_ptr = malloc(sizeof()) */ 1716,1717d1489 < assert(strlen(viewname)>0); < log_pr_add ("FO", viewname, FOelt); /* iff hcg_log */ 1729d1500 < log_pr_add ("GD", viewname, GDelt); 1735a1507 > printf("pr_gen_pkey returns %ux\n", (unsigned)HGelt->HGid); 1742d1513 < log_pr_add ("HG", viewname, HGelt); 1754d1524 < log_pr_add ("HN", viewname, HNelt); 1765d1534 < log_pr_add ("HA", viewname, HAelt); 1774d1542 < log_pr_add ("HL", viewname, HLelt); 1783d1550 < log_pr_add ("HP", viewname, HPelt); 1794d1560 < log_pr_add ("HI", viewname, HIelt); 1802d1567 < log_pr_add ("CG", viewname, CGelt); 1813d1577 < log_pr_add ("GX", viewname, GXelt); 1822d1585 < /* end of gen_pr_add output to pr_load.c */ 1880c1643 < dprint("TBD: Load checkpoint *DB1 then replay logfile.\n"); --- > dprint("TBD: Load checkpoint *DB1 then replay logfile.\n");//was bug - RA051126 1974c1737 < LP;return 0; // TBD: Client must close file --- > return 0; // TBD: Client must close file 1976,1977d1738 < /* end of gen_load_data output to pr_load.c */ < 1991c1752 < {EP; --- > { 2218,2228d1978 < /* Added by Genlog 5/8/96 to log pr_load */ < /* extern char *logfile; */ < char log_text[BUFSIZE]; < EP; < if ( hcg_log == 1 ) { < logwait(); < sprintf(log_text,"LD %s %s\n", viewname, file_name); < logstr(log_text); < } < /* End Genlog Addition */ < 2263,2267c2013,2015 < dprints( "load_data found SR cmd - calling pr_replay on file %s\n", < file_name); < dprintdd("hcg_log = %d, hcg_replay = %d\n", hcg_log, hcg_replay); < replayStatus = pr_replay(viewname, file_name, 1, 1); < --- > dprints("data file %s contains StartReplay = 'SR' cmd:\n", file_name); > dprint("Rebuild bde with chgen -log option to replay.\n"); > exit(3); /* TBD: Pick error # */ 2276,2277c2024,2025 < }/*if R..Status.. */ < }/* is logfie */ --- > } > } 2283c2031 < LP;return; --- > return; Only in pr_util_log: pr_load.c.060202 Only in pr_util_log: pr_load.c.errorlog060203.0053 Only in pr_util_log: pr_load.cvsdiff0060203 Only in pr_util_nolog: pr_load_nolog.cvsdiff Only in pr_util_log: pr_log.c Only in pr_util_log: prlogfiles.051105.0341 Only in pr_util_log: prlogfiles.051108.1944 Only in pr_util_log: prlogfiles.051111.0146 Only in pr_util_log: prlogfiles.060116.2259 Only in pr_util_nolog: prnologfiles.051105.0330 Only in pr_util_nolog: prnologfiles.051126.0052 Only in pr_util_nolog: prnologfiles.051201.2131 Only in pr_util_nolog: prnologfiles.060116.2258 Only in pr_util_log: saveprlogfiles.csh Only in pr_util_nolog: saveprnologfiles.csh Only in pr_util_log: test_decode_rtnstr.c Only in pr_util_log: testlinkparent