5a6,17 > /* > * $Log: pr_delete.c,v $ > * Revision 1.1.2.15 2004/12/17 06:33:46 lechner > * I removed LHS cast and added (struct dummy_type*) on RHS, line 85. > * This removed warnings frm a newer Linux verskon of gcc than Mercury has. > * > * Revision 1.1.2.14 2004/11/29 20:10:19 lechner > * Added $Log line to insert cvs rev comments in pr_*.c and *schema.h. > * > ************************************************************************/ > /* Log aded 041129 - RJL */ > 12c24 < extern void pr_find_bt(char*, hcg_key*); --- > /*extern void pr_find_bt(char*, hcg_key*); */ 15a28 > /* In *schema.h:454:#define pr_delete(tbl) pr_del(tbl##_idx) - RJL 030807 */ 18c31 < /* also unlinks the row from its table's row chain. */ --- > /* also unlinks the row from its table's row chain and invalidates tbl#curr. */ 67a81 > /* I moved LHS cast to (dummy_type)on RHS (PC/Linux gcc warning)-RJL041216 */ 75c89 < ( (struct pa *) ca##curr->p##_fpp == pa##temp)) /* only child case */ \ --- > ( ca##curr->p##_fpp == (struct dummy_type*)pa##temp)) /* only child case */ \ 126c140 < int tbl_idx; --- > int tbl_idx; /* index of table type in hcg_table_seq_list[] */ 127a142,144 > int tmpidx; /* encoding of ttabbrev - RJL 030807 */ > /* used to get ttabbrev for encoding */ > /* Why doesn't tbl_idx match encoding of ttabbrev? */ 133,134c150,151 < < switch( encoding(hcg_table_seq_list[tbl_idx].ttabbrev) ) --- > tmpidx = encoding(hcg_table_seq_list[tbl_idx].ttabbrev); > switch(tmpidx) 139a157 > printf("\t tbl_idx = %i, encoding(tabbrev) = %i\n",tbl_idx,tmpidx); 141,142c159,160 < del_row(FO); < --- > /* del_row(FO); moved below the logstr - RJL 031021*/ > /* and similarly for each case below - RJL 031021 */ 147c165 < --- > del_row(FO); 155d172 < del_row(GD); 161a179 > del_row(GD); 171d188 < del_row(HG); 177a195 > del_row(HG); 189d206 < del_row(HN); 195a213 > del_row(HN); 204d221 < del_row(HA); 210a228 > del_row(HA); 222d239 < del_row(HL); 228a246 > del_row(HL); 237d254 < del_row(HP); 243a261 > del_row(HP); 252d269 < del_row(HI); 258a276 > del_row(HI); 268d285 < del_row(CG); 274a292 > del_row(CG); 283d300 < del_row(GX); 289a307 > del_row(GX); 292c310,311 < } --- > /* TBD: add a default case with error/abort - RJL 031021 */ > } /* end switch */ 308c327,328 < default: printf("\n\tWARNING: pr_del_bt(%s, %x) called: not implemented \n\n", --- > default: > printf("\n\tWARNING: pr_del_bt(%s, %x) called: not implemented \n\n", 310c330 < } --- > }; ========================================= 1:5a6,17 14:12c24 18:15a28 20:18c31 24:67a81 26:75c89 30:126c140 34:127a142,144 38:133,134c150,151 44:139a157 46:141,142c159,160 52:147c165 56:155d172 58:161a179 60:171d188 62:177a195 64:189d206 66:195a213 68:204d221 70:210a228 72:222d239 74:228a246 76:237d254 78:243a261 80:252d269 82:258a276 84:268d285 86:274a292 88:283d300 90:289a307 92:292c310,311 97:308c327,328 102:310c330 //Above output is from diff and findChanges.csh =============================================== //Edits below added the type of change to each line above: (Note the unintended 1-line offset from an extra prefix line) 14 adds, 10 changes, 9 deletes in pr_delete.c: (Only 7 of 33 changeblocks affect procedural code) ------------------------------ 2:5a6,17* (* denotes a comment-only change) 15:12c24 rm decl 19:15a28* 21:18c31* 25:67a81* 27:75c89 upd macro 31:126c140* 35:127a142,144 add decl 39:133,134c150,151 split 1 stmt 45:139a157 add printf 47:141,142c159,160 first of paired no-ops 53:147c165 57:155d172 59:161a179 61:171d188 63:177a195 65:189d206 67:195a213 69:204d221 71:210a228 (all these are no-ops from diff misalignment) 73:222d239 75:228a246 77:237d254 79:243a261 81:252d269 83:258a276 85:268d285 87:274a292 89:283d300 91:289a307 93:292c310,311 last of paired no-ops 98:308c327,328 splint 1 stmt 103:310c330 added ';' -------------------