diff -bitw new_pr_util/94sbde_schema.h pr_util/94sbde_schema.h 11,12c11 < /* added 2k0901 - RJL: */ < #include --- > 45,46c44 < /* Terminating semicolon removed - add to macro invocation - RJL 2k0827 */ < /************************************************************************/ --- > /****************************************************************/ 49c47 < *tbl##curr2 = NULL , *tbl##temp2 = NULL --- > *tbl##curr2 = NULL , *tbl##temp2 = NULL; 51c49 < #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; 167,169c165,167 < void pr_find_bt(char*, hcg_key*); < /* char* decode_retstr(hcg_key*, char*); wrong*/ < char* decode_retstr(hcg_key*); /* RJL 2k0831 */ --- > void pr_find_bt(); > > char* decode_retstr(); 294,301c292,295 < /* error fix here only - RJL2k0804 */ < /* extern char *hcg_key, *key_value; / * for pr_set_key() - RJL*/ < /* fixed 2 duplcate defs, above - RJL 2k0717 */ < /* above fix was corrupted - fixed below only - RJL2k0804 */ < < /* extern hcg_key *key_value; ??? undef anywhere - RJL 2k0831 */ < /* extern int PARSE; ???? undefined anywhere - RJL 2k0831 ????? */ < /* I commmented out refs to PARSE, key_value (8 lines below) - RJL 2k0831 */ --- > extern char* hcg_key key_value; /* for pr_set_key() */ > extern int PARSE; > > /* fixed 2 duplcate defs above - RJL 2k0717 */ 305c299 < if((tbl)->RFLAG==1 && /*!PARSE &&*/ hcg_log ==1 )\ --- > if((tbl)->RFLAG==1 && !PARSE && hcg_log ==1 )\ 308c302 < decode_retstr((hcg_key*)(tbl)), #fld, (value) ); \ --- > decode_retstr( (hcg_key*)(tbl) ),#fld, ((long)value) );\ 315c309 < if((tbl)->RFLAG==1 && /*!PARSE &&*/ hcg_log ==1 )\ --- > if((tbl)->RFLAG==1 && !PARSE && hcg_log ==1 )\ 318c312 < decode_retstr( (hcg_key*)(tbl) ),#fld, (value) );\ --- > decode_retstr( (hcg_key*)(tbl) ),"fld", (value) );\ 325c319 < if((tbl)->RFLAG==1 && /*!PARSE &&*/ hcg_log ==1 )\ --- > if((tbl)->RFLAG==1 && !PARSE && hcg_log ==1 )\ 327c321 < hcg_key key_value = ( value ); /*??? unused - RJL */ \ --- > key_value = ( value ); \ 329,330c323 < decode_retstr((hcg_key*)(tbl)), \ < #fld, decode_retstr(&key_value) );\ --- > decode_retstr( (hcg_key*)(tbl) ),"fld", decode_retstr(value) );\ 334d326 < /* #fld was "fld" until 2k0831.0210 - RJL */ 340c332 < "Warning: field %s in table %s is too long- truncated\n",\ --- > "Warning: field %s in table %s is too long- truncated\n", 342c334 < if((tbl)->RFLAG==1 && /*!PARSE &&*/ hcg_log ==1 )\ --- > if((tbl)->RFLAG==1 && !PARSE && hcg_log ==1 )\ 777,779d768 < /* declare pr_set/pr_get_* also? (No-too many schema-dependent fields-RJL) */ < /* Declare pr_add outside #ifdef __cplusplus..#endif so linker finds it-RJL 2k0831*/ < #define pr_add(a,b,c) do_pr_add(a,#b,c) /* RJL 2k0831 - see pr_load.c */ 800d788 < extern void pr_load(char *, char *); 801a790,791 > /* #define pr_add(a,b,c) do_pr_add(a,#b,c) in pr_load.c */ > extern void pr_load(char *, char *); 1118c1108,1109 < /* moved to pr_load.c - no other user in bde/pr_util - RJL 2k0829 --- > > 1130c1121,1122 < */ --- > > #endif 1137,1138c1129,1130 < /* now conditionally declared above l. 204, so commented out - RJL 2k031 */ < /* --- > > 1156,1160c1148 < */ < /* void pr_find_bt(); (see l 780-RJL) */ < < /* end of #ifndef __SCHEMA_LOADED */ < #endif --- > void pr_find_bt(); Only in pr_util: CVS diff -bitw new_pr_util/Imakefile pr_util/Imakefile 2a3,15 > * Revision 1.4.2.7 2000/09/26 02:17:03 lechner > * Third try at removing ALL the imbedded /* or */ brackets :-( > * > * Revision 1.4.2.6 2000/09/26 02:10:20 lechner > * I removed the SAME error from my previous Revision Comment :-) > * > * Revision 1.4.2.5 2000/09/26 02:03:22 lechner > * I removed this imbedded-comment error from Imakefile: > * 65:/_* -ansi sets cli_ansi in chgen.c to select # not /_*_*_/ and #fld not "fld"*_/ > * > * Revision 1.4.2.4 2000/09/23 01:15:09 lechner > * Option -Wall added, option to use pre-genlog versions removed - RJL 2k0922 > * 24c37 < *Fixed # syntax error after cvs admin -c\ \* Imakefile in this subdiry today. --- > *Fixed # syntax error after cvs admin -c\ \_* Imakefile in this subdiry today. 57a71 > /* (NEW_VERSION flag is used in genv11/src/Makefile, not at runtime) */ 60d73 < /* (NEW_VERSION flag is used in genv11/src/Makefile, not at runtime) */ 62,63c75 < GENFLAGS= -ansi -metafile -log -nobp < /* -ansi sets cli_ansi in chgen.c to select # not /**/ and #fld not "fld"*/ --- > /* -ansi sets cli_ansi in chgen.c to select # not /_*_*_/ and #fld not "fld"*/ 66a79,81 > /* On bde2alpha_rv branch, ignore prior versions, use genv11 now- RJL 2k0922 */ > /* I added -DNEW_VERSION today - RJL 2k0402 : */ > /* removed pr_log.* files below - usleep invalid - RJL */ 68,79c83 < #ifdef GENV10 < GENSRCS = \ < pr_load.c \ < pr_free.c \ < pr_dump.c \ < pr_delete.c < GENOBJS = \ < pr_load.o \ < pr_free.o \ < pr_dump.o \ < pr_delete.o < #else --- > GENFLAGS= -ansi -metafile -log -nobp 85d88 < pr_log.c \ 92d94 < pr_log.o \ 94d95 < #endif 101a103 > Only in pr_util: Makefile Only in pr_util: Makefile.bak Only in pr_util: libname Only in new_pr_util: pr_check_str_test.c diff -bitw new_pr_util/pr_delete.c pr_util/pr_delete.c 8,9d7 < #include < /* stdlib contains free() */ 11,15d8 < void pr_del_bt(char*, hcg_key*); /* fwd ref */ < extern void pr_find_bt(char*, hcg_key*); /* in pr_load.c */ < extern int lut_insert_element(lut_st *, char *);/* in pr_load.c */ < extern void logwait(void); /* in pr_log.c */ < extern void logstr(char*); /* in pr_log.c */ 24d16 < 37c29 < pr_del_bt(tempbtree,&(tbl##curr->tbl##id)); \ --- > pr_del_bt(tempbtree,tbl##curr->tbl##id); \ 303c295,297 < void pr_del_bt(char* temp1, hcg_key* temp2) --- > pr_del_bt(temp1,temp2) > char *temp1; > hcg_key temp2; 305,306c299,301 < int tbl_encoding; < pr_find_bt( temp1, temp2); --- > int tbl_encoding, finish=FALSE ; > hcg_key result; > pr_find_bt( temp1, &temp2); 311,313d305 < default: printf( < "\n\tWARNING: pr_del_bt(%s, %x) called: not implemented\n\n", < temp1, (unsigned int) *temp2); diff -bitw new_pr_util/pr_dump.c pr_util/pr_dump.c 9d8 < extern int find_view_idx(char*); 11,23c10 < extern int meets_view(int, int, hcg_key); /* pr_load.c */ < extern int lut_insert_element(lut_st *, char *);/*find index in p_lut->names[]*/ < extern void hcg_update_version(hcg_key *pkey, < int tbl_idx, int is_new_version); /*in pr_load.c */ < < /* This outkey is local to pr_dump; it has a distinct scope in pr_load.c: */ < char outkey[3][HCG_KEY_SIZE+1]; /* used in dump_row */ < < /* encoding expands to (in pr_util/94sbde_*schema.h line 469): */ < /* #define encoding(s) (lut_insert_element(&hcg_table_abbrev_lut,s)) */ < int fstatus; < < void dump_row( char*, char*, char*, int, char* );/*fwd ref*/ --- > void dump_row(); 32,33c19 < void pr_dump (char* viewname, char* file_name, int new_version, char* modestr ) < /* pre-proto: --- > void pr_dump ( viewname, file_name, new_version, modestr ) 38d23 < */ 41c26 < /* This outkey is local to pr_dump; it has a distinct scope in pr_load.c */ --- > char outkey[3][HCG_KEY_SIZE+1]; 56,57c41 < printf("Error: pr_dump() cannot open %s using file mode %s\n", < file_name,modestr); --- > printf("Error: pr_dump() cannot open %s using file mode %s\n", file_name,modestr); 59c43 < }; --- > } 61,72c45,47 < { /* cast hcg_view_idx to int does not avoid warning - RJL 2k0827 */ < /* can't merge next two without warning-RJL 2k0827*/ < int tslistIndex; < tslistIndex = /* split expression to find Warning source: */ < hcg_view_list.view_list[(int)hcg_view_idx].version_list[hcg_tbl_idx]; < if (hcg_ts_list[hcg_tbl_idx].ts_list[tslistIndex].rcount > 0) < { < /* in *bde*schema.h line 469:: < #define encoding(s) (lut_insert_element(&hcg_table_abbrev_lut, s)) < */ < switch((int) encoding(hcg_table_seq_list[hcg_tbl_idx].ttabbrev)) < --- > if (hcg_ts_list[hcg_tbl_idx].ts_list[hcg_view_list.view_list[hcg_view_idx].version_list[hcg_tbl_idx]].rcount > 0) > { > switch( encoding(hcg_table_seq_list[hcg_tbl_idx].ttabbrev) ) 84a60 > 91a68 > 98a76 > 105a84 > 112a92 > 119a100 > 126a108 > 133a116 > 140a124 > 144,152d127 < } /*end switch */ < } /* end if */ < } /* end for */ < < fstatus = fclose(hcg_dump_fp); < if (fstatus != 0) < printf("\n\nERROR: pr_dump File failed to close!\n\n"); < open_file = 1; < } /* end pr_dump */ 153a129,133 > } > } > fclose(hcg_dump_fp); > open_file=1; > } 164,166c144,149 < < void dump_row ( char* tbl, char* viewname, char* file_name, < int new_version, char* modestr ) --- > void dump_row ( tbl,viewname, file_name,new_version, modestr ) > char tbl[]; > char viewname[]; > char file_name[]; > int new_version; > char modestr[]; 168c151,153 < int idx = encoding(tbl); --- > char outkey[3][HCG_KEY_SIZE+1]; > int idx; > idx=encoding(tbl); 180c165 < decode((char*)outkey[0], &FOcurr->FOid); --- > decode(outkey[0], &FOcurr->FOid); diff -bitw new_pr_util/pr_free.c pr_util/pr_free.c 8,11d7 < #include < /* includes void free(void*) */ < void logwait(void); < void logstr(char*); 33c29 < void pr_free(void) --- > void pr_free() diff -bitw new_pr_util/pr_load.c pr_util/pr_load.c 6,14c6 < /* changed pr_gen_key to pr_set_key - RJL 2k0826 */ < /* oops - that is a pr_set_* logging macro in schema.h! revert - RJL 2k0827 */ < /* TBD: check use of OLD vs. NEW key component format constants at l.1190 - < * These are really for 8 vs. 12-char ASCII key options- RJL 2k0826 < */ < /* File pr_load.c.2k0827.1555 compiled successfully at 1430 today. Then I fixed < * poor indents and split string printouts to avoid line-wraps. RJL 2k0827 4PM < */ < /* 2k0828.2200: I moved hcg_tbl_idx array here from schema.h - RJL */ --- > 22,47d13 < char outkey[3][HCG_KEY_SIZE+1]; /* used in log_pr_add() */ < /* A distinct outkey is local to pr_dump.c; RJL 2k0827 */ < /* forward declaration - RJL 2k0822 */ < int btree_insert_node(btree_node_st**, char*, int); < int lut_does_node_exist(lut_st*, char*); < int btree_does_node_exist(btree_node_st*, char*); < int btree_destroy(btree_node_st*, btree_node_st*); < int btree_create(lut_st*); < int btree_wt(btree_node_st*); < void btree_initialized(void); < void logwait(void); < void logstr(char*); < < /* moved here from schema.h - no other user in bde/{src pr_util} - RJL 2k0829 */ < /* this was inside #ifndef SCHEMA_LOADED...#endif there */ < static char *hcg_tbl_abbr[] = { < "FO", < "GD", < "HG", < "HN", < "HA", < "HL", < "HP", < "HI", < "CG", < "GX" }; 60d25 < 74c39 < s2 = s; /* save s */ --- > s2 = s; 80,81c45 < /* for (; n>0; n--) */ < while (n>0){ --- > for (s; n>0; n--) 83,84d46 < n--; < } 86c48 < s = s2; /* restore s */ --- > s = s2; 88,91c50 < for ( i=strlen(s)-1; < ( i>=0 ) && ( (s[i] == ' ') || (s[i] == '\t') ); < i-- < ) --- > for (i=strlen(s)-1; (i>=0) && ((s[i] == ' ') || (s[i] == 9)); i--) 131c90,91 < int find_tbl_idx(const char* pkey) /* const added for pr_log.c - RJL 2k0829 */ --- > int find_tbl_idx(pkey) > char *pkey; 148,149c108,109 < int find_view_idx(char* viewname) < --- > int find_view_idx(viewname) > char *viewname; 168,170c128,131 < < int meets_view(int tbl_idx, int view_idx, hcg_key pkey) < /* A non-trivial meets_view without the NEWVERSION option of chgen builds */ --- > int meets_view(tbl_idx,view_idx,pkey) > int tbl_idx; > int view_idx; > hcg_key pkey; 186c147 < printf("Error: pkey %8x is an ivalid key!\n", (unsigned int) pkey); --- > printf("Error: pkey %u is an ivalid key!\n",pkey); 201c162 < printf("Error: Invalid pkey %8x !\n",(unsigned int)pkey); --- > printf("Error: Invalid pkey %u !\n",pkey); 203c164 < printf("Error: Invalid fkey %8x !\n",(unsigned int) fkey); --- > printf("Error: Invalid fkey %u !\n",fkey); 230,231c191,192 < void hcg_parse(char *s, char *w, int *idx) < /* char *s; --- > void hcg_parse(s,w,idx) > char *s; 234d194 < */ 257c217 < /* If is_new_version flag indicates a new version should be generated, and */ --- > /* If the new version flag indicates a new version should be generated, and */ 262c222 < /* by tbl_idx). Arg3 locally renamed is_new_version - RJL 2k0826 */ --- > /* by tbl_idx). */ 264,265c224,225 < void hcg_update_version(p_key, tbl_idx, is_new_version) < hcg_key* p_key; /* ptr to a compressed p/fkey */ --- > void hcg_update_version(pkey, tbl_idx, new_version) > hcg_key *pkey; 267c227 < int is_new_version; --- > int new_version; 269c229 < if ((is_new_version) && --- > if ((new_version) && 272,274c232,233 < if(set_version(p_key, hcg_table_seq_list[tbl_idx].maxver +1) != 1) < printf("Error: Can not set version# at p_key=%lu to %d\n", < (unsigned long)p_key, hcg_table_seq_list[tbl_idx].maxver + 1); --- > if(set_version(pkey, hcg_table_seq_list[tbl_idx].maxver +1) != 1) > printf("Error: Can not set version of pkey %u to %d\n", *pkey, hcg_table_seq_list[tbl_idx].maxver + 1); 278c237 < --- > ; 439,441c398,400 < lut_insert_element(lut_st *p_lut, /* ptr to lut */ < char *name /* string of element to insert */ < ) --- > lut_insert_element(p_lut, name) > lut_st *p_lut; /* ptr to lut */ > char name[]; /* string of element to insert */ 445c404 < int /* abbr_size, */ --- > int abbr_size, 460,462c419 < printf( < "%s : Input character string != required abbreviation size...\n", < name); --- > printf("%s : Input character string != required abbreviation size...\n", name); 484,485c441 < printf( < "Input character string != required version size...\n"); --- > printf("Input character string != required version size...\n"); 585c541 < /* int idx; */ --- > int idx; 636,637d591 < * added 2k0804 941PM - RJL: */ < /* int lut_does_node_exist(lut_st*, char*);*/ 686c640 < /* char *p_ch; */ --- > char *p_ch; 850,851d803 < /* int btree_does_node_exist(btree_node_st*, char*); */ < 910d861 < /* int btree_insert_node(btree_node_st**, char*, int);*/ 919,920c870,871 < int test; < /* int loop = TRUE; */ --- > int test, > loop = TRUE; 995d945 < /* int btree_create(lut_st*); */ 1002,1003c952,953 < /* int ret_stat, */ < int idx; --- > int ret_stat, > idx; 1046d995 < /* int btree_destroy(btree_node_st*, btree_node_st*); */ 1188d1136 < /* int btree_wt(btree_node_st*); */ 1205c1153 < /* private functions for key servicing (not exported for general use) */ --- > /********************** private functions used by the key servicing functions (not exported for general use) */ 1236c1184 < static hcg_key null_key_p = (hcg_key)0x0; /* was 999999999 - RJL2k0827 */ --- > static hcg_key null_key_p = 999999999; 1286c1234 < /* char* rval; */ --- > char* rval; 1406,1407c1354 < if( (lut_st*) &hcg_table_abbrev_lut == (lut_st*)NULL ) < /* ensure necessary tables have been initialized */ --- > if( (lut_st*) &hcg_table_abbrev_lut == (lut_st*)NULL ) /* ensure necessary tables have been initialized */ 1413,1415c1360 < printf( < "Key encode: invalid character key length: %d; key: %s\n", < klen, external_key); --- > printf("Key encode: invalid character key length: %d; key: %s\n",klen,external_key); 1420,1423c1365,1366 < for( i=0; i < klen; i++ ) /* added (int) casts - RJL 2k0822 */ < t[i] = < /* ( isupper(external_key[i])? external_key[i] : deleted-RJL 2k0822*/ < toupper((int)external_key[i]); --- > for( i=0; i < klen; i++ ) > t[i] = (isupper(external_key[i]) ? external_key[i] : toupper(external_key[i])); 1467,1468c1410,1411 < char* decode_retstr(hcg_key * k ) < /* hcg_key* k; */ --- > char* decode_retstr( k ) > hcg_key* k; 1476,1477c1419 < * Decode the encoded key k, update string in external_key, return +/- 1.:1 < --- > * Decode the encoded key k, return string in external_key 1479,1481c1421,1423 < int decode( char* external_key, hcg_key * k ) < /* char* external_key; < hcg_key* k; */ --- > int decode( external_key, k ) > char* external_key; > hcg_key* k; 1531c1473 < else return 1; --- > if( *(unsigned long*)k1 > *(unsigned long*)k2 ) return 1; 1580c1522 < /* unsigned int vri; */ --- > unsigned int vri; 1603c1545 < if( r > max_row )/* assigned from MAX_ROW -RJL 2k0826 */ --- > if( r > max_row ) 1648,1649c1590 < void pr_init (char* viewdef_filename, char* filelist) < /* prior non-ansi: --- > void pr_init ( viewdef_filename, filelist) 1652d1592 < */ 1658,1660c1598,1600 < char temp_mode[8],temp_command[100],table_abbrev[ABBREV_NAME_LENGTH], < temp_verstring[10], error_table[ABBREV_NAME_LENGTH]; < /* FILE filevar; */ --- > char temp_mode[8],temp_command[100],table_abbrev[ABBREV_NAME_LENGTH],temp_verstring[10], error_table[ABBREV_NAME_LENGTH]; > FILE filevar; > 1679,1680c1619 < printf( < "Error: pr_init() called when database is already initialized.\n"); --- > printf("Error: pr_init() called when database is already initialized.\n"); 1687,1688c1626 < hcg_table_seq_list[hcg_tbl_idx].rcount = < hcg_table_seq_list[hcg_tbl_idx].maxver = 0; --- > hcg_table_seq_list[hcg_tbl_idx].rcount = hcg_table_seq_list[hcg_tbl_idx].maxver = 0; 1731,1733c1669 < printf( < "Warning: unknown table %s found in scanned datafile %s, ignored.\n", < error_table,scan_filename); --- > printf("Warning: unknown table (%s) found in scanned datafile %s, ignored.\n",error_table,scan_filename); 1739c1675 < printf("Warning: invalid keysize %d for key %s, must be %d, ignored.\n", (int)strlen(hcg_t), hcg_t, HCG_KEY_SIZE); --- > printf("Warning: invalid keysize %d for key %s, must be %d, ignored.\n", strlen(hcg_t), hcg_t, HCG_KEY_SIZE); 1752,1753c1688 < printf("Warning: invalid version %d for key %s, exiting.\n", < atoi(temp_verstring), hcg_t); --- > printf("Warning: invalid version %d for key %s, exiting.\n", atoi(temp_verstring), hcg_t); 1760a1696 > 1771,1772c1707 < < fclose(hcg_ascii_fp); --- > close(hcg_ascii_fp); 1775a1711 > 1807,1808c1743 < printf("Error: mode %s specified for view %s is invalid.\n", < temp_mode,viewname); --- > printf("Error: mode %s specified for view %s is invalid.\n",temp_mode,viewname); 1813,1815c1748 < printf( < "Error: Too many views defined (max=%d), next view would have been %s.\n", < MAXVIEWS,viewname); --- > printf("Error: Too many views defined (max=%d), next view would have been %s.\n",MAXVIEWS,viewname); 1818,1821c1751,1752 < strcpy(hcg_view_list.view_list[hcg_view_list.num_views].view_name, < viewname); < hcg_view_list.view_list[hcg_view_list.num_views].mode = < temp_mode[0]; --- > strcpy(hcg_view_list.view_list[hcg_view_list.num_views].view_name,viewname); > hcg_view_list.view_list[hcg_view_list.num_views].mode = temp_mode[0]; 1823,1824c1754 < hcg_view_list.view_list[hcg_view_list.num_views].version_list[i]= < '\0'; --- > hcg_view_list.view_list[hcg_view_list.num_views].version_list[i] = '\0'; 1826c1756 < } /* end if strcmp "define view" */ --- > } /* if define_view */ 1833,1834c1763 < printf("Warning: view %s specified in view_element statement \n\ < is not defined, ignored.\n",viewname); --- > printf("Warning: view %s specified in view_element statement is not defined, ignored.\n",viewname); 1841,1843c1770 < printf("Warning: unknown table (%s) specified for view %s\n\ < in view_element statement, ignored.\n", < table_abbrev,viewname); --- > printf("Warning: unknown table (%s) specified for view %s in view_element statement, ignored.\n",table_abbrev,viewname); 1851,1853c1778 < printf("Warning: version-offset %d specified for view %s\n\ < in view_element statement is out of range, ignored.\n", < hcg_version,viewname); --- > printf("Warning: version-offset %d specified for view %s in view_element statement is out of range, ignored.\n",hcg_version,viewname); 1861,1863c1786 < printf("Error: view %s invoked on table %s as write, \n\ < MAXVERSION is %d was used\n", < viewname, table_abbrev, MAXVERSIONS); --- > printf("Error: view %s invoked on table %s as write, MAXVERSION of %d is used\n",viewname, table_abbrev, MAXVERSIONS); 1869,1872c1792 < printf("Warning: absolute version-number %d specified for view %s\n\ < in view_element statement exceeds current max-version (%d),\n\ < ignored.\n", hcg_version, viewname, < hcg_table_seq_list[hcg_tbl_idx].maxver); --- > printf("Warning: absolute version-number %d specified for view %s in view_element statement is higher than current max-version (%d), ignored.\n",hcg_version,viewname,hcg_table_seq_list[hcg_tbl_idx].maxver); 1877,1878c1797 < if ((hcg_version < 0) && < ((hcg_table_seq_list[hcg_tbl_idx].maxver+hcg_version) < 1) ) --- > if ((hcg_version < 0) && ((hcg_table_seq_list[hcg_tbl_idx].maxver+hcg_version) < 1) ) 1880,1884c1799,1800 < printf("Warning: version-offset %d specified for view %s \n\ < in view_element statement would lead to an invalid ", < hcg_version,viewname); < printf("version number (<1), ignored (current max-version = %d)\n", < hcg_table_seq_list[hcg_tbl_idx].maxver); --- > printf("Warning: version-offset %d specified for view %s in view_element statement would lead ",hcg_version,viewname); > printf("to an invalid version number (<1), current max-version (%d), ignored.\n",hcg_table_seq_list[hcg_tbl_idx].maxver); 1892,1893c1808 < } /* if strcmp view_element */ < --- > } /* if view_element */ 1897,1898c1812 < printf("Warning: unknown command (%s) found in view-definition \n\ < file (%s), ignored.\n" ,temp_command, viewdef_filename); --- > printf("Warning: unknown command (%s) found in view-definition file (%s), ignored.\n",temp_command,viewdef_filename); 1904c1818 < fclose(hcg_ascii_fp); --- > close(hcg_ascii_fp); 1912c1826 < /* Description: This routine is used to reset btree. */ --- > /* Description: This routine is used to reset btree. .*/ 1914c1828 < /* Output: none. Side effects: resets tables to no btree index */ --- > /* Output: none.( it will reset table 's btree. */ 1916c1830 < void btree_initialized() --- > btree_initialized() 1919a1834 > } 1931,1934d1845 < < } < else {/* should this be null? - RJL */}; < return; 2172c2083 < /* should also set all keys to null_key() but doesn't right now -- MM */ --- > /* This should also set all the keys to null_key() but doesn't right now -- MM */ 2176,2177c2087,2088 < /* Macro pr_gen_key assigns to key the next available primary key value, */ < /* from passed args: char* tbl_abbrv, current version and next row numbers.*/ --- > /* This macro is to generate the next available primary key value for the */ > /* specified table, using the specified view. */ 2180,2182c2091,2092 < #define pr_gen_key(key, tbl_abbrv, version_no, next_row_no) \ < do { /* put new key at address of key */\ < (key) = *null_key();/* value null_key_p */\ --- > #define pr_gen_key(key,tbl_abbrv,version_id,entry_id) \ > (key) = *null_key();\ 2184,2213c2094,2098 < set_version(&(key), (version_no));\ < set_row(&(key), (next_row_no)); \ < } while (0) < < < /*************************************************************************/ < /* Macro pr_gen_pkey calls find_view_idx to validate current viewname, < * gets args from hcg_* structs and calls pr_gen_key to update pkey; < * if validation fails, *pkey is initialized to 0; < * pkey is target ptr; tt is unquoted ttype, tbl_abbrv is char* - RJL 2k0826 < *************************************************************************/ < /* Precondition: REQUIRE hcg_tbl_idx (set by find_tbl_idx(pkey)- RJL 2k0826)*/ < < #define pr_gen_pkey(viewname, tt, pkey) \ < do {\ < if (find_view_idx(viewname)){ /* update hcg_view_idx */\ < int version_no, next_row_no, tt##idx;\ < char* tbl_abbrv;\ < tt##idx = (int) hcg_tbl_idx; /* preset global from find_tbl_idx() */\ < tbl_abbrv = hcg_table_seq_list[tt##idx].ttabbrev;\ < assert(strcmp(tbl_abbrv, #tt));/*new 2k0826 6PM - RJL */\ < /* cast ts_list[] subscript to int - RJL 2k0826 1030PM */\ < version_no = (hcg_view_list.view_list[hcg_view_idx].version_list[tt##idx]);\ < next_row_no = (hcg_ts_list[tt##idx].ts_list[(int)hcg_view_list.view_list[hcg_view_idx].version_list[tt##idx]].maxrow+1)/*(int) added 2k0826 11PM-RJL*/;\ < pr_gen_key((pkey), tbl_abbrv, version_no, next_row_no); \ < }\ < else pkey = *null_key(); /* value = null_key_p if fail precond'n -RJL2k0826*/\ < } while (0); < < /* old vers: pr_gen_key(pkey, hcg_table_seq_list[tbl##_idx].ttabbrev, \ --- > set_version(&(key), (version_id));\ > set_row(&(key), (entry_id))\ > \n#define pr_gen_pkey(viewname,tbl,pkey) \ > if (find_view_idx(viewname)) \ > pr_gen_key(pkey,hcg_table_seq_list[tbl##_idx].ttabbrev, \ 2215,2216c2100 < hcg_ts_list[tbl##_idx].ts_list[hcg_view_list.view_list[hcg_view_idx].version_list[tbl##_idx]].maxrow+1;}\ < */ --- > hcg_ts_list[tbl##_idx].ts_list[hcg_view_list.view_list[hcg_view_idx].version_list[tbl##_idx]].maxrow+1) 2218,2224d2101 < /* Call history: do_pr_add->pr_check_fkey->pr_gen_key; < * pr_gen_pkey ->pr_gen_key; < * pr_check_fkey modified: print 32bit unsigned fkey as hex - RJL 2k0717 < * pr_check_fkey below passes stringized ctbl_abbr to printf, < * and calls pr_gen_key [???] with ptbl_abbr not stringized - RJL 2k0825 < * See schema.h: 787: extern int set_abbr(hcg_key *, char *); < */ 2225a2103 > /* pr_check_fkey modified: print 32bit unsigned fkey as 4000d558 - RJL 2k0717 */ 2227,2228d2104 < do {\ < /* Warning: ptr arg4 passed to ui, not printf; is it 2188 and 2195? */\ 2231,2234c2107,2109 < printf( /* args2-4: #, unsigned long, %lx - RJL 2k0826.1630 */\ < "Warning: foreign key %s is not set, tbltype %s row at %lx;\n", \ < #ckey, #ctbl_abbr, (unsigned long)(ctbl_ptr));\ < pr_gen_key( (ctbl_ptr)->ckey, #ptbl_abbr, 0, 0);\ --- > printf("Warning: foreign key %s is not set for table %s element %8x\n", \ > ckey#, ctbl_abbr#, ctbl_ptr );\ > pr_gen_key( (ctbl_ptr)->ckey,ptbl_abbr#, 0, 0);\ 2241,2271c2116,2118 < pr_gen_key( (ctbl_ptr)->ckey, #ptbl_abbr, 0, 0);\ < };\ < };\ < } while (0); < /* missing '}' fixed; above: cc but not gcc found missing 'while'-RJL 2k0827 */ < < /******************************************************************************/ < /* Macro pr_check_str sets the default value of non-key field type cnn or tnn */ < /******************************************************************************/ < /* tbl_abbr,fldname are unquoted, tbl_ptr is type tbl_abbr* (tbl row ptr) */ < /* I replaced full ??..?? padding with "???\0" - RJL 2k0822 */ < /* TBD: is VMNetDB field "???\0" without blank padding OK? - RJL 2k0822 */ < /* outer braces limit scope of local i - RJL 2k0824 */ < /* maxlength of default fill ("???") should be #defined in schema.h */ < /* Errors 2k0826 245AM: line 2179: < * pr_gen_pkey(viewname,FO,FOelt->FOid); 2424:arr ndx of type char < * pr_check_str (FO,FOelt,xfont,50); 2466:arg4 ptr from ui: printf*(,,,XXid) < */ < #define pr_check_str(tbl_abbr,tbl_ptr,fldname,length) \ < do {\ < int i = (int)strlen(tbl_ptr->fldname); \ < if (i == 0) { \ < printf(\ < "Warning: null %s.%s : expanded to at most '???' for pkey %ux\n", \ < #tbl_abbr, #fldname, (unsigned int) tbl_ptr->tbl_abbr##id);\ < i = ((i > 3)?3:i); /* 3 is max length of replacement text */\ < tbl_ptr->fldname[i--] = (char)'\0';\ < for ( ; i>=0; i--) \ < (tbl_ptr)->fldname[i--] = (char)'?';\ < }; /* end if i==0 */\ < } while (0); --- > pr_gen_key( (ctbl_ptr)->ckey, ptbl_abbr#, 0, 0);\ > }\ > } 2273c2120,2134 < /**************************************************************************/ --- > /******************************************************************************/ > /* This macro is used set the default value of non-key fields of type cX or tX*/ > /******************************************************************************/ > > #define pr_check_str(tbl_abbr,tbl_ptr,fld,length) \ > if ( (tbl_ptr)->fld[0] == '\0' ) \ > {\ > int i = sizeof((tbl_ptr)->fld) - 2;\ > printf("Warning: string field %s is not set for table %s element %8x\n", \ > fld#, tbl_abbr#, tbl_ptr);\ > for((tbl_ptr)->fld[i] = '\0'; i>=0; (tbl_ptr)->fld[i--] = '?');\ > } > > > /********************************************************************************/ 2280,2284c2141,2143 < /*****************************************************************************/ < /* RJL: tbl must be a char* or stringized to pass to this function! */ < void log_pr_add (char* tbl, char* viewname, hcg_ptr tbl_ptr) < { < /* --- > /********************************************************************************/ > > void log_pr_add (tbl, viewname, tbl_ptr) 2288,2289c2147,2148 < */ < char outkey[3][HCG_KEY_SIZE+1]; /* decoded p/fkeys are buffered here */ --- > { > char outkey[3][HCG_KEY_SIZE+1]; 2306,2309c2165,2166 < PrintCheck(fprintf(hcg_logfileptr, < " %-8s %-50s %-50s %-2s %-15s\n", < outkey[0], FOcurr->xfont, FOcurr->psfontname, < FOcurr->psfontsize, FOcurr->bdefont)); --- > PrintCheck(fprintf(hcg_logfileptr, " %-8s %-50s %-50s %-2s %-15s\n" > , outkey[0], FOcurr->xfont, FOcurr->psfontname, FOcurr->psfontsize, FOcurr->bdefont)); 2316,2321c2173,2175 < 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)); --- > 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)); 2328,2332c2182,2184 < 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)); --- > 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)); 2341,2347c2193,2195 < 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 --- > 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 2390,2394c2238,2240 < 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)); --- > 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)); 2428,2431d2273 < /* Update - RJL 2k0825 - pr_add calling do_pr_add stringized tbl_abbrv < * prematurely - do NOT quote it in pr_check_str function calls below. < */ < 2438c2280 < /* char tempkey[HCG_KEY_SIZE+1]; unused-RJL2k0822*/ --- > char tempkey[HCG_KEY_SIZE+1]; 2443,2445d2284 < /* size of tbl_abbrv precludes spaces if a legal table type? */ < /* perhaps to handle short and long mixed, with short left-padded? */ < /* else assert(*tbl-abbrv != ' ')(NO leading spaces) - RJL 2k0825 */ 2453d2291 < /* for how long ? - RJL 2k0822 */ 2460,2461c2298,2299 < }; < }; --- > } > } 2466,2472c2304,2305 < printf( < "Error: [do_]pr_add() ignored - database not initialized.\n"); < < /* Next line handled in case switch if args are legal; - why try it here? */ < /* tbl_abbrv must be quoted - fparam is a char[] - RJL 2k0825 */ < /* log_pr_add (tbl_abbrv, viewname, tbl_ptr); */ < --- > printf("Error: [do_]pr_add() called when database is not yet initialized.\n"); > log_pr_add (tbl_abbrv, viewname, tbl_ptr); 2478,2479c2311,2312 < printf("[do_]pr_add ignored; view %s not found.\n",viewname); < /* log_pr_add (tbl_abbrv, viewname, tbl_ptr); */ --- > printf("Error: view %s passed to pr_load is not defined.\n",viewname); > log_pr_add (tbl_abbrv, viewname, tbl_ptr); 2485,2488c2318,2319 < printf( < "Warning: unknown table (%s) passed to pr_add, ignored.\n", < error_table); < /* log_pr_add (tbl_abbrv, viewname, tbl_ptr); */ --- > printf("Warning: unknown table (%s) passed to pr_add, ignored.\n",error_table); > log_pr_add (tbl_abbrv, viewname, tbl_ptr); 2492,2493c2323 < hcg_version = < hcg_view_list.view_list[hcg_view_idx].version_list[hcg_tbl_idx]; --- > hcg_version = hcg_view_list.view_list[hcg_view_idx].version_list[hcg_tbl_idx]; 2498,2503c2328,2329 < < switch( tbl_encoding ) { < < /* pr_check_str truncates too-long string values - RJL 2k0825 */ < /* pr_gen_pkey Preconditions: valid hcg_tbl_idx, hcg_view_idx */ < /* from find_tbl_idx() and find_view_idx()*/ --- > switch( tbl_encoding ) > { 2508,2509d2333 < assert(strlen(FOelt->psfontname)>0); < assert(strlen(FOelt->xfont)>=0); 2511d2334 < assert(strlen(FOelt->psfontsize)>0); 2513d2335 < assert(strlen(FOelt->bdefont)>0); 2515,2516c2337 < assert(strlen(viewname)>0); /* FOelt->viewname N/A - RJL */ < log_pr_add ("FO", viewname, FOelt); --- > log_pr_add (tbl_abbrv, viewname, FOelt); 2528c2349 < log_pr_add ("GD", viewname, GDelt); --- > log_pr_add (tbl_abbrv, viewname, GDelt); 2541c2362 < log_pr_add ("HG", viewname, HGelt); --- > log_pr_add (tbl_abbrv, viewname, HGelt); 2553c2374 < log_pr_add ("HN",viewname, HNelt); --- > log_pr_add (tbl_abbrv, viewname, HNelt); 2564c2385 < log_pr_add ("HA",viewname, HAelt); --- > log_pr_add (tbl_abbrv, viewname, HAelt); 2573c2394 < log_pr_add ("HL", viewname, HLelt); --- > log_pr_add (tbl_abbrv, viewname, HLelt); 2582c2403 < log_pr_add ("HP", viewname, HPelt); --- > log_pr_add (tbl_abbrv, viewname, HPelt); 2593c2414 < log_pr_add ("HI", viewname, HIelt); --- > log_pr_add (tbl_abbrv, viewname, HIelt); 2601c2422 < log_pr_add ("CG", viewname, CGelt); --- > log_pr_add (tbl_abbrv, viewname, CGelt); 2612c2433 < log_pr_add ("GX", viewname, GXelt); --- > log_pr_add (tbl_abbrv, viewname, GXelt); 2616c2437 < }; --- > } 2628,2629d2448 < < 2633c2452 < static char rcsid[] = "$Id:"; --- > static char rcsid[] = "$Id"; 2637c2456 < void pr_parse(); /* fwd decl - 93su523 PGEN merge */ --- > void pr_parse(); /* 93su523 PGEN merge */ 2639c2458 < /*(on line 195:) void hcg_read_next();*/ --- > hcg_read_next(); 2655,2657c2474,2475 < { printf( < "Warning: invalid keysize %d for key %s, must be %d, ignored.\n", < (int)strlen(hcg_t), hcg_t, HCG_KEY_SIZE); --- > { > printf("Warning: invalid keysize %d for key %s, must be %d, ignored.\n", strlen(hcg_t), hcg_t, HCG_KEY_SIZE); 2699a2518 > 2706,2714c2525,2531 < void pr_parse (char viewname[], char buffer[], < int tbl_encoding, int idx, hcg_key hcg_k) < {/*new 8/27*/ < < < < < < /*{ 8/27*/ --- > void pr_parse (viewname, buffer, tbl_encoding, idx, hcg_k) > char viewname[]; > char buffer[]; > int tbl_encoding; > int idx; > hcg_key hcg_k; > { 2923,2924c2740,2741 < /***********************************************************************/ < /* The pr_load routine loads the virtual memory tables from the */ --- > /*********************************************************************/ > /* This routine is used to load the virtual memory tables from the */ 2930,2931c2747,2748 < void pr_load ( char* viewname, char* file_name) < /* pre-proto decls: char viewname[],file_name[]; */ --- > void pr_load ( viewname, file_name) > char viewname[],file_name[]; 2936c2753,2754 < /*logwait(); see line 27 */ --- > > logwait(); 2938c2756 < /* logstr(log_text); see line 28 */ --- > logstr(log_text); 2941,2943c2759,2761 < if (!hcg_initialized) { < printf("Error: pr_load() called when database is not yet initialized.\n" < ); --- > if (!hcg_initialized) > { > printf("Error: pr_load() called when database is not yet initialized.\n"); 2947c2765,2766 < if (!find_view_idx(viewname)) { --- > if (!find_view_idx(viewname)) > { 2957c2776 < fclose(hcg_ascii_fp);/* added f to close - RJL 2k0827.1455 */ --- > close(hcg_ascii_fp); 2966,2967c2785,2787 < /* WARNING: Not implemented - merely checks tbl-abbrv validity - RJL 2k0828 */ < void pr_find_bt(char *temp1, hcg_key *temp2) --- > void pr_find_bt(temp1,temp2) > char *temp1; > hcg_key *temp2; 2969c2789,2790 < int tbl_encoding; --- > int tbl_encoding, finish=FALSE ; > hcg_key result; 2975c2796 < } /* I hope find_tbl_idx sets hcg_tbl_idx! - RJL 2k0828 */ --- > } 2980d2800 < default: printf("\n\t pr_find_bt called, but NOT implemented!\n"); diff -bitw new_pr_util/pr_log.c pr_util/pr_log.c 6,7c6 < /* Log_do_add uses mystrcpy; log_do_set_str uses strcpy; Why? - RJL */ < /* One may null-terminate, the other may blank-fill ascii string fields? */ --- > 13d11 < #include 15d12 < /* In schema.h: #define pr_add(a,b,c) do_pr-add(a,#b,c )- RJL 2k0829 */ 21,48d17 < #ifdef __STDC__ < /* mystrcpy is defined in pr_load.c */ < extern void mystrcpy(char *, const char *, int, int); < /* lut_insert_element in pr_load.c, called when 'encoding' is expanded */ < extern int lut_insert_element(lut_st *, char *); < #else < strcpy(); < extern int lut_insert_element(); < #endif < /* in pr_load.c: */ < extern void hcg_parse(char*, char*, int*); < extern int lut_insert_element(lut_st*, char*); < extern int find_view_idx(char*); < extern int find_tbl_idx(const char*); /* added const 2k20829 - RJL */ < extern void hcg_read_next(void); < extern void pr_init (char*, char*); < extern void pr_load (char*, char*); < extern void pr_free(void); < < /* in pr_delete.c: macro pr_delete and pr_del() */ < extern void pr_del(int); /* REQUIRES XXcurr ptr */ < < /* in pr_dump.c: */ < extern void pr_dump (char*, char*, int, char*); < < /* from : */ < int unlink(const char*); < int close(int); 50,51d18 < /* fwd ref: */ < int usleep(struct timeval *); 109c76 < __FILE__, __LINE__, status); /* local fix 2k0804 - RJL */ --- > status); 343c310 < return 0 /* added 2k0829 - RJL */; --- > 357c324,325 < void logstr(char text[BUFSIZE]) --- > void logstr(text) > char text[BUFSIZE]; 376c344 < void logwait(void) --- > void logwait() 387,388c355 < "%s: %d: logwait: timeval2millisec failed\n", < __FILE__,__LINE__); --- > "%s: %d: logwait: timeval2millisec failed\n"); 411,412c378,379 < int pr_startlog (char* file_name, char* viewname) < /* char file_name[]; --- > int pr_startlog (file_name, viewname) > char file_name[]; 414d380 < */ 511,512c477,478 < int pr_stoplog (char* viewname, int dump_flag) < /*char viewname[]; --- > int pr_stoplog (viewname, dump_flag) > char viewname[]; 514d479 < */ 602d566 < /*tempnewlist = "\0" ? - RJL 2k0822 */ 605c569 < sprintf(tempfname,"temp%s",token); --- > sprintf(tempfname,"temp%s\0",token); 670,671c634,635 < int log_do_add(char *view, char *tablename, char *theRest) < /*char *view; --- > int log_do_add(view,tablename,theRest) > char *view; 674d637 < */ 678,679c641,642 < /* unused: char pkey[HCG_KEY_SIZE+1]; */ < /* unused: int tablename_size ; */ --- > char pkey[HCG_KEY_SIZE+1]; > int tablename_size; 690a654,663 > #ifdef __STDC__ > /* mystrcpy is defined in pr_load.c */ > extern void mystrcpy(char *, const char *, int, int); > /* lut_insert_element is defined in pr_load.c and is used in the encoding macro*/ > /* extern int lut_insert_element(lut_st *, char *); */ > #else > extern void mystrcpy(); > /* extern int lut_insert_element(); */ > #endif > 692d664 < /* why isn't status set and returned? - RJL 2k0829 */ 698c670 < return (status = -1); /* 'status =' added - RJL 2k0829 */ --- > return -1; 712,714c684 < fprintf(stderr,"%s: %d: log_do_add: pr_create failed\n ", < __FILE__, __LINE__); < return (status = -1); /* added - RJL 2k0829 */ --- > fprintf(stderr,"%s: %d: do_log_add: pr_create failed\n", __FILE__, __LINE__); 716,717d685 < /* CANNOT CONTINUE USING FO_elt === NULL? - RJL 2k0829 */ < /* TBD: check status and skip theRest of this line on return - RJL 2k0829 */ 732,733c700 < fprintf(stderr,"%s: %d: log_do_add: pr_create failed\n", __FILE__, __LINE__); < return (status = -1); /* added - RJL 2k0829 */ --- > fprintf(stderr,"%s: %d: do_log_add: pr_create failed\n", __FILE__, __LINE__); 760,761c727 < fprintf(stderr,"%s: %d: log_do_add: pr_create failed\n", __FILE__, __LINE__); < return (status = -1); /* added - RJL 2k0829 */ --- > fprintf(stderr,"%s: %d: do_log_add: pr_create failed\n", __FILE__, __LINE__); 781,782c747 < fprintf(stderr,"%s: %d: log_do_add: pr_create failed\n", __FILE__, __LINE__); < return (status = -1); /* added - RJL 2k0829 */ --- > fprintf(stderr,"%s: %d: do_log_add: pr_create failed\n", __FILE__, __LINE__); 817,818c782 < fprintf(stderr,"%s: %d: log_do_add: pr_create failed\n", __FILE__, __LINE__); < return (status = -1); /* added - RJL 2k0829 */ --- > fprintf(stderr,"%s: %d: do_log_add: pr_create failed\n", __FILE__, __LINE__); 845,846c809 < fprintf(stderr,"%s: %d: log_do_add: pr_create failed\n", __FILE__, __LINE__); < return (status = -1); /* added - RJL 2k0829 */ --- > fprintf(stderr,"%s: %d: do_log_add: pr_create failed\n", __FILE__, __LINE__); 865,866c828 < fprintf(stderr,"%s: %d: log_do_add: pr_create failed\n", __FILE__, __LINE__); < return (status = -1); /* added - RJL 2k0829 */ --- > fprintf(stderr,"%s: %d: do_log_add: pr_create failed\n", __FILE__, __LINE__); 885,886c847 < fprintf(stderr,"%s: %d: log_do_add: pr_create failed\n", __FILE__, __LINE__); < return (status = -1); /* added - RJL 2k0829 */ --- > fprintf(stderr,"%s: %d: do_log_add: pr_create failed\n", __FILE__, __LINE__); 913,914c874 < fprintf(stderr,"%s: %d: log_do_add: pr_create failed\n", __FILE__, __LINE__); < return (status = -1); /* added - RJL 2k0829 */ --- > fprintf(stderr,"%s: %d: do_log_add: pr_create failed\n", __FILE__, __LINE__); 934,935c894 < fprintf(stderr,"%s: %d: log_do_add: pr_create failed\n", __FILE__, __LINE__); < return (status = -1); /* added - RJL 2k0829 */ --- > fprintf(stderr,"%s: %d: do_log_add: pr_create failed\n", __FILE__, __LINE__); 959,962d917 < return 0; /* added 2k0829 - ctrl reached end of non-void fcn */ < /* 'status' value was not be maintained - I returned status from cases < * but I ignored handling it temporarily - RJL 2k0829 < */ 969c924 < --- > /* datfiles separated by spaces to the filenames with the */ 995c950 < sprintf(outstr,"temp%s",token); /* removed '\0'- RJL 2k0822 */ --- > sprintf(outstr,"temp%s\0",token); 1001c956 < sprintf(temp," temp%s",token); --- > sprintf(temp," temp%s\0",token); 1129,1135d1083 < < /* Conjecture by RJL - 2k0829: The code expansion below < * might be simplified by invoking macros defined in schema.h; < * gencpp might avoid these macros by inline methods; < * However, TA-table lookup of attribute names can't be avoided < * since runtime name identification is necessary. < */ 1142c1090 < int tbl_encoding/*, fld_encoding */; --- > int tbl_encoding, fld_encoding; 1284c1232 < int tbl_encoding/*, fld_encoding*/; --- > int tbl_encoding, fld_encoding; 1467c1415 < int tbl_encoding/*, fld_encoding*/; --- > int tbl_encoding, fld_encoding; 1633c1581 < int tbl_encoding/*, fld_encoding*/; --- > int tbl_encoding, fld_encoding; 1809,1812c1757,1760 < /* Effects: */ < /* hcg_buffer - altered */ < /* hcg_ascii_fp - altered */ < /* hcg_t - altered */ --- > /* Effects: > /* hcg_buffer - altered > /* hcg_ascii_fp - altered > /* hcg_t - altered 1862c1810 < sprintf(newdatafile,"temp%s",datafile); /*\0 removed - RJL 2k0822*/ --- > sprintf(newdatafile,"temp%s\0",datafile); 1870c1818 < } /* exit - end of file */ --- > } 2005c1953 < /* unused: int tbl_encoding;*/ --- > int tbl_encoding; 2064c2012 < /* unused: FILE *log_fp;*/ --- > FILE *log_fp; 2098,2099c2046 < sprintf(filelist,"%s %s",tempfilelist, logfiledb); < /* removed '\0'- RJL 2k0822 */ --- > sprintf(filelist,"%s %s\0",tempfilelist, logfiledb); Only in pr_util: pr_util.a