ver_11.vs.ver_11_link.dif - RJL050401 ------------------ saturn.cs.uml.edu(208)> diff ver_11/chgen/src ver_11_link/chgenv11/chgen/src|grep diff 8:diff -bitw ver_11/chgen/src/aareadme ver_11_link/chgenv11/chgen/src/aareadme 87:diff -bitw ver_11/chgen/src/chgen.c ver_11_link/chgenv11/chgen/src/chgen.c 100:diff -bitw ver_11/chgen/src/gen_defines.c ver_11_link/chgenv11/chgen/src/gen_defines.c 504:diff -bitw ver_11/chgen/src/gen_pr_load.c ver_11_link/chgenv11/chgen/src/gen_pr_load.c 551:diff -bitw ver_11/chgen/src/gen_pr_log.c ver_11_link/chgenv11/chgen/src/gen_pr_log.c ----------------------- saturn.cs.uml.edu(209)> diff ver_11/chgen/src ver_11_link/chgenv11/chgen/src >ver_11.vs.ver_11_link.dif ------------------------------------------------------------- Only in ver_11/chgen/src: .#gen_defines.c.1.7 Only in ver_11/chgen/src: .#gen_defines.c.1.7.4.3 Only in ver_11/chgen/src: .#gen_pr_load.c.1.4 Only in ver_11/chgen/src: .#gen_pr_load.c.1.4.4.2 Only in ver_11/chgen/src: .#gen_pr_log.c.1.2 Only in ver_11/chgen/src: .#gen_pr_log.c.1.2.4.1 Common subdirectories: ver_11/chgen/src/CVS and ver_11_link/chgenv11/chgen/src/CVS diff -bitw ver_11/chgen/src/aareadme ver_11_link/chgenv11/chgen/src/aareadme 1c1 < aareadme in $CASE/gen/ver_11/chgen/src - RJL --- > aareadme in $CASE/99s523/genmerge/chgen/src -update RJL 01021: 3,45c3,28 < Update 2k0718 5AM: < ----------------- < I corrected syntax errors in 4 of 5 gen_pr_*.c files then recompiled < genv11 OK. I failed to check in these files because chgen doesn't like < my CVS/Tag = Ngenv11 instead of Tgenv11 as in 99s523/genmerge. < New versions are backed up as gen*.new. < < < Update 2k0718: < -------------- < Chgen on alpha hosts now supports bde (thanks to Rattakorn Poonsup < and 2ks523 students who fixed bde's make problems and compile-time errors). < Chgen now supports genlog features including pr_set_field log and replay, < thanks to R Rassmann. asabnis began merging the above features. < gen/ver_11/chgen finished the merging (cvs branch tag genv11) < in 99f522, thanks to jkarner and kspinney, who also finished the chgen bootstrap < process. Chgenv11 uses a library generated by itself from metaschema input. < This input is passed to the application to support reflection about the format < of the database for which it generates code. < < Update 981212: < ------------- < Shell proc 'build' will generate chgen_release_date.c < and is called from the build label in Makefile. < Chgen now builds on alpha hosts (thanks to Mark Aldred.) < < Update for genv8: < ---------------- < The following files are used to generate lut.c and lut.h < when building genv8. < They are used to generate the real lut.* by executing < 'make gen_lut'. Cflow won't work on genv8source unless < this is done first. < < cs(200)> lg lut* < -rwxr-xr-x 1 lechner 92s523 13679 Aug 18 1993 lut_c_file.h < -rwxr-xr-x 1 lechner 92s523 2563 Aug 18 1993 lut_h_file.h < < Chgen for alpha machines required fixing integer vs. pointer size problems. < That is more important for its generated code, in applicatios like bde. < Before this, bde couldn't buid or run on alpha hosts either, < since they rebuild pr_util by running chgen on the host < machine of the compiler (alpha in this case). --- > Tonight I replaced tag Ngenv11 with tag Ttag01f522 (see chgen aareadme). > Then cvs ci succeeded on chgen/aareadme and chgen/src/aareadme. > > This version is intended to be the baseline for sjaganat's 01f522 update > of src/gen*.c files to match my hand-edits of ~/bde2alpha_rjl/bde/pr_util. > > ------------------------------------- > - update RJL 2k0329: > > THe cvs tag history identifies several tags - which one used > durng jkarner's checkin seems confused. I checked out with -r genv11 > at $CASE?gen/ver_11 and got TAG content Ngenv11 (non-branch tag). > In genmerge, Tag is Tgenv11 (side branch?). > CVSROOT/modules says that the only module in CVS is chgen only. > cvs history -aT lists MANY tags because it shows file-level events > with tags in brackets. The OSDev with CVS text (Coriolis 1999) > says there is no convenient way to see all the tags in a repository > (p. 230 suggests cvs log -h and look for the list at 'symbolic names') > > ====================================================================== > > Following is obsolete - from cvs repository checkout - RJL 2k0329 > > aareadme in gen/ver_8/doc - RJL 94/7/21 > > rest deleted - RJL Only in ver_11_link/chgenv11/chgen/src: aareadme.2k0329 Only in ver_11_link/chgenv11/chgen/src: aareadme.990804 Only in ver_11/chgen/src: chgen.970511 diff -bitw ver_11/chgen/src/chgen.c ver_11_link/chgenv11/chgen/src/chgen.c 244,246c244 < printf( < "CHGEN-F-BADKEYSIZE, keysize %d is invalid it must be 8 or 12 \n", < argv[j]); --- > printf("CHGEN-F-BADKEYSIZE, %d is an invalid value for the keysize qualifier\n", argv[j]); 258c256,257 < printf( "CHGEN-F-BADMAXVIEWS, %d is an invalid value for the maxviews qualifier\n", argv[j]); --- > printf("CHGEN-F-BADMAXVIEWS, %d is an invalid value for the maxviews qualifier\n", > argv[j]); Only in ver_11/chgen/src: gen+pr+loadTruncated.c diff -bitw ver_11/chgen/src/gen_defines.c ver_11_link/chgenv11/chgen/src/gen_defines.c 27,36d26 < <<<<<<< gen_defines.c < <<<<<<< gen_defines.c < /* Apr26 1999 Hand merged ctwang updates of pr_set_key, pr_set_ */ < /* flt, pr_set_int, and pr_set_str, - clearly */ < /* delineated by wang's BEGIN and END markers.[JSK?] */ < /* Jul15 2000: pr_add reverted to a macro calling do_pr_add; */ < /* also reformatted some fprintf text . - RJL */ < ======= < >>>>>>> 1.7 < ======= 40d29 < >>>>>>> 1.7.4.3 148,164c137,145 < fprintf(schh_fp, < "/************************************************************************/\n"); < fprintf(schh_fp, < "/* This macro will either declare or define the table variables for each*/\n"); < fprintf(schh_fp, < "/* table in the schema. This general approach (#ifdef MAIN) is used */\n"); < fprintf(schh_fp, < "/* to distinguish between main and non-main modules. In a main, */\n"); < fprintf(schh_fp, < "/* a definition or a variable initialization can occur. In a non-main, */\n"); < fprintf(schh_fp, < "/* only a declaration can occur, so the word extern is used. Although */\n"); < fprintf(schh_fp, < "/* VAX 'C' can handle redundant definitions, some UNIX C versions cannot*/\n"); < < fprintf(schh_fp, < "/****************************************************************/\n"); --- > fprintf(schh_fp,"/******************************************************************************/\n"); > fprintf(schh_fp,"/* This macro will either declare or define the table variables for each */\n"); > fprintf(schh_fp,"/* table in the schema. This general approach (#ifdef MAIN) is used often */\n"); > fprintf(schh_fp,"/* to distinguish between a main module and a non-main module. In a main, */\n"); > fprintf(schh_fp,"/* a definition can occur, and variable initialization can occur. In a non- */\n"); > fprintf(schh_fp,"/* main, only a declaration can occur, so the word extern is used. Although */\n"); > fprintf(schh_fp,"/* VAX 'C' can handle redundant definitions, several versions of 'C' for UNIX */\n"); > fprintf(schh_fp,"/* cannot. */\n"); > fprintf(schh_fp,"/******************************************************************************/\n"); 167,168c148,149 < /* I moved '#ifdef MAIN' below pr_add's definition - RJL 96/8/31 < * pr_add generates 'implicit function decl' and 'undefined' errors without it --- > /* I moved '#ifdef MAIN' below pr_add's definition - RJL 96/8/31 * > * pr_add generates 'implicit function decl and undefined' errors without it * 169a151 > * 172,182d153 < <<<<<<< gen_defines.c < <<<<<<< gen_defines.c < < /* 93su523 PGEN merge (BEGIN) (deleted 99s523 [for?] chgenbootstrap) */ < /*if (cli_ansi) < fprintf(schh_fp, "#define pr_add(view,tbl_abbr,tbl_ptr) gen_pr_add(view, #tbl_abbr, tbl_ptr)\n"); < ======= < if (cli_ansi) < fprintf(schh_fp, "#define pr_add(view,tbl_abbr,tbl_ptr) gen_pr_add(view, #tbl_abbr, tbl_ptr)\n"); < >>>>>>> 1.7 < ======= 186d156 < >>>>>>> 1.7.4.3 192,199c162,165 < fprintf(schh_fp, < "#ifdef MAIN\n") ; /* moved here by RJL 96/8/31 */ < fprintf(schh_fp, < "#define hcg_declare(tbl) *tbl = NULL , *tbl%scurr = NULL , *tbl%stemp = NULL , *tbl%send = NULL , *tbl%selt = NULL,\\\n",sep,sep,sep,sep) ; < fprintf(schh_fp, < " *tbl%scurr2 = NULL , *tbl%stemp2 = NULL;\n",sep,sep) ; < fprintf(schh_fp, < "#else\n") ; --- > fprintf(schh_fp, "#ifdef MAIN\n") ; /* moved here by RJL 96/8/31 */ > fprintf(schh_fp, "#define hcg_declare(tbl) *tbl = NULL , *tbl%scurr = NULL , *tbl%stemp = NULL , *tbl%send = NULL , *tbl%selt = NULL,\\\n",sep,sep,sep,sep) ; > fprintf(schh_fp, " *tbl%scurr2 = NULL , *tbl%stemp2 = NULL;\n",sep,sep) ; > fprintf(schh_fp, "#else\n") ; 201c167 < /* define pr_add here also to fix compile time bug for bde. */ --- > /* define pr_add here also to fix compile time but for bde. */ 203,211d168 < <<<<<<< gen_defines.c < <<<<<<< gen_defines.c < /* fprintf(schh_fp, < "#define pr_add(view,tbl_abbr,tbl_ptr) gen_pr_add(view, #tbl_abbr, tbl_ptr)\n");*/ < fprintf(schh_fp, < "#define hcg_declare(tbl) *tbl, *tbl%scurr, *tbl%stemp, *tbl%send, *tbl%selt, *tbl%scurr2, *tbl%stemp2;\n", < ======= < fprintf(schh_fp, "#define pr_add(view,tbl_abbr,tbl_ptr) gen_pr_add(view, #tbl_abbr, tbl_ptr)\n"); < ======= 213d169 < >>>>>>> 1.7.4.3 215d170 < >>>>>>> 1.7 217,218c172 < fprintf(schh_fp, < "#endif\n\n") ; --- > fprintf(schh_fp, "#endif\n\n") ; 220,226c174,177 < fprintf(schh_fp, < "/************************************************************************/\n"); < fprintf(schh_fp, < "/* This macro allows optional insertion of the word 'extern' in various*/\n"); < fprintf(schh_fp, < "/* structures and variables. */\n"); < fprintf(schh_fp,"/***************************************************/\n"); --- > fprintf(schh_fp,"/******************************************************************************/\n"); > fprintf(schh_fp,"/* This macro allows the optional insertion of the word 'extern' in various */\n"); > fprintf(schh_fp,"/* structures and variables. */\n"); > fprintf(schh_fp,"/******************************************************************************/\n"); 233,245c184,190 < fprintf(schh_fp, < "/***********************************************************************/\n"); < fprintf(schh_fp, < "/* These macros are constants, ***copys of the same constants embedded */\n"); < fprintf(schh_fp, < "/* in CHGEN. */\n"); < fprintf(schh_fp,"/***************************************************/\n"); < fprintf(schh_fp, < "#define SCHEMA_TEXT_FILE_NAME \"%s\"\n", sch_text_file_name) ; < fprintf(schh_fp, < "#define SCHEMA_HEADER_FILE_NAME \"%s\"\n",sch_header_file_name ) ; < fprintf(schh_fp, < "#define SCHEMA_HEADER_FILE_NAME_LENGTH %d\n",SCHEMA_HEADER_FILE_NAME_LENGTH ) ; --- > fprintf(schh_fp,"/******************************************************************************/\n"); > fprintf(schh_fp,"/* These macros are constants, which are copys of the same constants embedded */\n"); > fprintf(schh_fp,"/* in CHGEN. */\n"); > fprintf(schh_fp,"/******************************************************************************/\n"); > fprintf(schh_fp, "#define SCHEMA_TEXT_FILE_NAME \"%s\"\n", sch_text_file_name) ; > fprintf(schh_fp, "#define SCHEMA_HEADER_FILE_NAME \"%s\"\n",sch_header_file_name ) ; > fprintf(schh_fp, "#define SCHEMA_HEADER_FILE_NAME_LENGTH %d\n",SCHEMA_HEADER_FILE_NAME_LENGTH ) ; 257,264c202,205 < fprintf(schh_fp, < "/***********************************************************************/\n"); < fprintf(schh_fp, < "/* These macros are based on the schema itself. */\n"); < fprintf(schh_fp, < "/***********************************************************************/\n"); < fprintf(schh_fp, " < #define HCG_NUM_TABLES %d\n\n", num_tables); --- > fprintf(schh_fp,"/******************************************************************************/\n"); > fprintf(schh_fp,"/* These macros are based on the schema itself. */\n"); > fprintf(schh_fp,"/******************************************************************************/\n"); > fprintf(schh_fp, "#define HCG_NUM_TABLES %d\n\n", num_tables); 273,280c214,221 < fprintf(schh_fp, < "/************************************************************/\n"); < fprintf(schh_fp, < "/* The following decls are for key manipulation. */\n"); < fprintf(schh_fp, < "/* The key type is defined here as well. */\n"); < fprintf(schh_fp, < "/**i*********************************************************/\n"); --- > > > > > fprintf(schh_fp, "/****************************************************/\n"); > fprintf(schh_fp, "/* The following decls are for key manipulation. */\n"); > fprintf(schh_fp, "/* The key type is defined here as well. */\n"); > fprintf(schh_fp, "/****************************************************/\n"); 300,301c241 < fprintf(schh_fp, < "/******** End of key manipulation decls ****************/\n\n"); --- > fprintf(schh_fp, "/******** End of key manipulation decls ****************/\n\n"); 303,305c243 < /*** < 95s523,chwang,5,11,95. Add btree structures and other relative btree arguments. < ***/ --- > /*** 95s523,chwang,5,11,95. Add btree structures and other relative btree arguments. ***/ 308,315c246,249 < fprintf(schh_fp, < "\n\n/*******************************************************************/\n"); < fprintf(schh_fp, < "/* The following define the btree structures and relative variables for */\n"); < fprintf(schh_fp, < "/* each table which defines btree search in schema file. */\n"); < fprintf(schh_fp, < "/**********************************************************************/\n\n"); --- > fprintf(schh_fp,"\n\n/******************************************************************************/\n"); > fprintf(schh_fp,"/* The following define the btree structures and relative variables for each */\n"); > fprintf(schh_fp,"/* table which defines btree search in schema file. */\n"); > fprintf(schh_fp,"/******************************************************************************/\n\n"); 324,325c258,259 < /* made this an extern int and declared them as ints in gen_pr_utils.c */ < /* to fix multiply defined problem on OSF. maldred 22-Nov-95 */ --- > /* made this an extern int and declared them as ints in */ > /* gen_pr_utils.c to fix mulitiply defined problem on OSF. maldred 22-Nov-95 */ 330,331c264 < fprintf(schh_fp, < "/***********************************************************************/\n"); --- > fprintf(schh_fp,"/******************************************************************************/\n"); 333,334c266 < fprintf(schh_fp, < "/***********************************************************************/\n"); --- > fprintf(schh_fp,"/******************************************************************************/\n"); 343,344c275 < fprintf(schh_fp, < "hcg_extern struct %sbtree *%sbtroot,*%sbtelt,*%sbttemp,*%sbtcurr; \n\n" --- > fprintf(schh_fp,"hcg_extern struct %sbtree *%sbtroot,*%sbtelt,*%sbttemp,*%sbtcurr; \n\n" 354,371c285,292 < fprintf(schh_fp, < "/***********************************************************************/\n"); < fprintf(schh_fp, < "/* This structure holds information about a single view. Version list */\n"); < fprintf(schh_fp, < "/* is really a list of numbers, but since version numbers are in the range*/\n"); < fprintf(schh_fp, < "/* 01->99, they can be stored in a single byte. This was done to minimize*/\n"); < fprintf(schh_fp, < "/* storage requirements of internal structures. For a 12-char key option,*/\n"); < fprintf(schh_fp, < "/* a 3-char version number embedded in key fields becomes a 2-hex-digit */\n"); < fprintf(schh_fp, < "/* value (range [0..255]), an internal key fits into one byte. */\n"); < fprintf(schh_fp, < "/************************************************************************/\n"); < /* end of reformatting experiment to make text output more readable - RJL */ < --- > fprintf(schh_fp,"/******************************************************************************/\n"); > fprintf(schh_fp,"/* This structure holds all information about a single view. Version list */\n"); > fprintf(schh_fp,"/* is really a list of numbers, but since version numbers are in the range */\n"); > fprintf(schh_fp,"/* 01->99, they can be stored in a single byte. This was done to minimize */\n"); > fprintf(schh_fp,"/* the storage requirements of internal structures. In the future, even if */\n"); > fprintf(schh_fp,"/* the 2-character version number embedded inside key fields becomes a 2-digit*/\n"); > fprintf(schh_fp,"/* hexadecimal value, it can still be stored in a single byte. */\n"); > fprintf(schh_fp,"/******************************************************************************/\n"); 444,520d364 < <<<<<<< gen_defines.c < <<<<<<< gen_defines.c < ======= < >>>>>>> 1.7.4.3 < < <<<<<<< gen_defines.c < fprintf(schh_fp,"\n/* BEGIN MODIFICATION, ctwang, 12/20/97 */\n\n"); < fprintf(schh_fp, < "extern char* hcg_key key_value; /* for pr_set_key() */\n"); < fprintf(schh_fp,"extern int PARSE;\n\n"); < fprintf(schh_fp, "/* fixed 2 duplcate defs above - RJL 2k0717 */\n\n"); < fprintf(schh_fp,"#define pr_set_int(tbl,fld,value) \\\n"); < fprintf(schh_fp," do{\\\n"); < fprintf(schh_fp, < " if((tbl)->RFLAG==1 && !PARSE && hcg_log ==1 )\\\n"); < fprintf(schh_fp, < " { \\\n"); < fprintf(schh_fp, < " fprintf( hcg_logfileptr, \"PR_SET_INT %%s %%s %%d\\n\", \\\n"); < fprintf(schh_fp, < " decode_retstr( (hcg_key*)(tbl) ),#fld, ((long)value) );\\\n"); < fprintf(schh_fp, < " } \\\n"); < fprintf(schh_fp," (tbl)->fld = (value); \\\n"); < fprintf(schh_fp, < " }while(0) \n\n"); < ======= < fprintf(schh_fp,"#define pr_set_int(tbl,fld,value) (tbl)->fld = (value)\n"); < fprintf(schh_fp,"#define pr_set_flt(tbl,fld,value) (tbl)->fld = (value)\n"); < fprintf(schh_fp,"#define pr_set_key(tbl,fld,value) (tbl)->fld = (value)\n"); /* 93su523 PGEN merge new macro */ < fprintf(schh_fp,"\n"); < >>>>>>> 1.7 < < <<<<<<< gen_defines.c < fprintf(schh_fp, < "#define pr_set_flt(tbl,fld,value) \\\n"); < fprintf(schh_fp, < " do{\\\n"); < fprintf(schh_fp, < " if((tbl)->RFLAG==1 && !PARSE && hcg_log ==1 )\\\n"); < fprintf(schh_fp, < " {\\\n"); < fprintf(schh_fp, < " fprintf( hcg_logfileptr, \"PR_SET_FLT %%s %%s %%f\\n\",\\\n"); < fprintf(schh_fp, < " decode_retstr( (hcg_key*)(tbl) ),\"fld\", (value) );\\\n"); < fprintf(schh_fp, < " }\\\n"); < fprintf(schh_fp, < " (tbl)->fld = (value); \\\n"); < fprintf(schh_fp, < " }while(0)\n\n"); < ======= < if (cli_ansi) { < >>>>>>> 1.7 < < <<<<<<< gen_defines.c < fprintf(schh_fp, < "#define pr_set_key(tbl,fld,value) \\\n"); < fprintf(schh_fp, < " do{\\\n"); < fprintf(schh_fp, < " if((tbl)->RFLAG==1 && !PARSE && hcg_log ==1 )\\\n"); < fprintf(schh_fp, < " {\\\n"); < fprintf(schh_fp, < " key_value = ( value ); \\\n"); < fprintf(schh_fp, < " fprintf( hcg_logfileptr, \"PR_SET_KEY %%s %%s %%s\\n\",\\\n"); < fprintf(schh_fp, < " decode_retstr( (hcg_key*)(tbl) ),\"fld\", decode_retstr(value) );\\\n"); < fprintf(schh_fp, < " }\\\n"); < fprintf(schh_fp, < " (tbl)->fld = (value); \\\n"); < fprintf(schh_fp, < " }while(0)\n\n"); 522,547d365 < fprintf(schh_fp, < "#define pr_set_str(tbl,fld,value) \\\n"); < fprintf(schh_fp, < " do{\\\n"); < fprintf(schh_fp, < " if ( strlen(value) >= sizeof((tbl)->fld) ) \\\n"); < fprintf(schh_fp, < " fprintf(stderr, \\\n"); < fprintf(schh_fp, < " \"Warning: field %%s in table %%s is too long- truncated\\n\", < #fld, #tbl);\\\n"); < fprintf(schh_fp, < " if((tbl)->RFLAG==1 && !PARSE && hcg_log ==1 )\\\n"); < fprintf(schh_fp, < " {\\\n"); < fprintf(schh_fp, < " fprintf( hcg_logfileptr, \"PR_SET_STR %%s %%s %%s\\n\",\\\n"); < fprintf(schh_fp, < " decode_retstr( (hcg_key*)(tbl) ),#fld, (value) );\\\n"); < fprintf(schh_fp, < " } \\\n"); < fprintf(schh_fp, < " strncpy((tbl)->fld, (value), sizeof((tbl)->fld)-1); \\\n"); < fprintf(schh_fp, < " }while(0)\n\n"); < ======= 594d411 < >>>>>>> 1.7.4.3 596d412 < <<<<<<< gen_defines.c 598,623d413 < ======= < /* This do/while loop usage is REALLY ugly - MM */ < fprintf(schh_fp,"#define pr_set_str(tbl,fld,value) \\\n"); < fprintf(schh_fp," do { \\\n"); < fprintf(schh_fp," if ( strlen(value) >= sizeof((tbl)->fld) ) \\\n"); < fprintf(schh_fp," fprintf(stderr, \"Warning: field %%s in table %%s is too long - truncated\\n\", #fld, #tbl);\\\n"); < fprintf(schh_fp," strncpy((tbl)->fld, (value), sizeof((tbl)->fld)-1); \\\n"); < fprintf(schh_fp," } while(0)\n"); < fprintf(schh_fp,"\n"); < } < < else { < ======= < fprintf(schh_fp,"/* END MODIFICATION, ctwang, 12/20/97 */\n\n"); < >>>>>>> 1.7.4.3 < < /* This do/while loop usage is REALLY ugly - MM */ < fprintf(schh_fp,"#define pr_set_str(tbl,fld,value) \\\n"); < fprintf(schh_fp," do { \\\n"); < fprintf(schh_fp," if ( strlen(value) >= sizeof((tbl)->fld) ) \\\n"); < fprintf(schh_fp," fprintf(stderr, \"Warning: field %%s in table %%s is too long - truncated\\n\", \"fld\", \"tbl\");\\\n"); < fprintf(schh_fp," strncpy((tbl)->fld, (value), sizeof((tbl)->fld)-1); \\\n"); < fprintf(schh_fp," } while(0)\n"); < fprintf(schh_fp,"\n"); < } < >>>>>>> 1.7 724c514 < fprintf(schh_fp, "\t\t{\"%s\",0,0}",tt_curr->TTabbr); --- > fprintf(schh_fp, "\t\t\"%s\",0,0",tt_curr->TTabbr); 1110,1111c900,901 < fprintf(schh_fp, < "\n\ --- > fprintf(schh_fp,"\ > \n\ 1133,1140d922 < <<<<<<< gen_defines.c < <<<<<<< gen_defines.c < extern void do_pr_add(char *, char *, hcg_ptr);\n\ < /* #define pr_add(a,b,c) do_pr_add(a,#b,c) in pr_load.c */\n\ < ======= < extern void gen_pr_add(char *, char *, hcg_ptr);\n\ < >>>>>>> 1.7 < ======= 1142d923 < >>>>>>> 1.7.4.3 Only in ver_11/chgen/src: gen_defines.new Only in ver_11/chgen/src: gen_pr_Updates.lst Only in ver_11/chgen/src: gen_pr_add.hlp Only in ver_11/chgen/src: gen_pr_add.new Only in ver_11/chgen/src: gen_pr_delete.new diff -bitw ver_11/chgen/src/gen_pr_load.c ver_11_link/chgenv11/chgen/src/gen_pr_load.c 40,41d39 < <<<<<<< gen_pr_load.c < <<<<<<< gen_pr_load.c 45,51d42 < ======= < >>>>>>> 1.4 < ======= < void gen_pr_find_bt(); /* forward declaration - genMerge 99s523 */ < void gen_pr_clear_bt(); /* forward declaration - genMerge 99s523 */ < < >>>>>>> 1.4.4.2 54,61d44 < <<<<<<< gen_pr_load.c < <<<<<<< gen_pr_load.c < static char rcsid[] = < "$Id: gen_pr_load.c,v 1.4.4.2 1999/05/07 01:25:14 jkarner Exp $"; < ======= < static char rcsid[] = "$Id"; < >>>>>>> 1.4 < ======= 63d45 < >>>>>>> 1.4.4.2 65,78c47,53 < fprintf(prload_fp, < "/*********************************************************************/\n"); < fprintf(prload_fp, < "/* This routine is used to load the virtual memory tables from the */\n"); < fprintf(prload_fp, < "/* specified file, using the specified view. All rows that */\n"); < fprintf(prload_fp, < "/* meet the criteria of the view will be loaded. This routine merely */\n"); < fprintf(prload_fp, < "/* verifys the view name, opens the file, and then calls load_data. */\n"); < fprintf(prload_fp, < "/* It also closes the file. */\n"); < fprintf(prload_fp, < "/***********************************************************************/\n"); --- > fprintf(prload_fp, "/******************************************************************************/\n"); > fprintf(prload_fp, "/* This routine is used to load the contents of the virtual database from the */\n"); > fprintf(prload_fp, "/* specified file, using the specified view. All rows from the file that */\n"); > fprintf(prload_fp, "/* meet the criteria of the view will be loaded. This routine itself really */\n"); > fprintf(prload_fp, "/* just verifys the view name, opens the file, and then calls load_data. */\n"); > fprintf(prload_fp, "/* It also closes the file. */\n"); > fprintf(prload_fp, "/******************************************************************************/\n"); Only in ver_11/chgen/src: gen_pr_load.new diff -bitw ver_11/chgen/src/gen_pr_log.c ver_11_link/chgenv11/chgen/src/gen_pr_log.c 749c749 < /*ANSI warns if '\0' is imbedded in a string - OK here as an end marker-RJL*/ --- > Only in ver_11/chgen/src: gen_pr_utils.new Only in ver_11_link/chgenv11/chgen/src: genv11.vs.genlog_branch.dif Only in ver_11/chgen/src: genv11Diffs.lst Only in ver_11_link/chgenv11/chgen/src: metaschema.msdat Only in ver_11/chgen/src: pr_find_bt.dif