diff --git a/src/sequencer/gen_tables.c b/src/sequencer/gen_tables.c index 83f4a16b8..9dc7ddd42 100644 --- a/src/sequencer/gen_tables.c +++ b/src/sequencer/gen_tables.c @@ -15,6 +15,7 @@ 17may94,ajk removed old event flag (-e) option. 20jul95,ajk Added unsigned types. 22jul96,ajk Added castS to action, event, delay, and exit functions. +09mar98,wfl Avoided compilation warnings under Tornado ***************************************************************************/ /*#define DEBUG 1*/ @@ -145,7 +146,7 @@ int elem_num; /* Now, fill in the dbCom structure */ - printf(" \"%s\", ", db_name);/* unexpanded db channel name */ + printf(" {\"%s\", ", db_name);/* unexpanded db channel name */ /* Ptr or offset to user variable */ printf("(void *)"); @@ -172,7 +173,7 @@ int elem_num; /* monitor flag */ printf("%d", mon_flag); - printf(",\n\n"); + printf("},\n\n"); return; } @@ -251,7 +252,7 @@ Expr *sp; char *ss_name; { - printf("\t/* State \"%s\"*/\n", sp->value); + printf("\t/* State \"%s\" */ {\n", sp->value); printf("\t/* state name */ \"%s\",\n", sp->value); @@ -261,7 +262,7 @@ char *ss_name; printf("\t/* delay function */ (DELAY_FUNC) D_%s_%s,\n", ss_name, sp->value); - printf("\t/* event mask array */ EM_%s_%s,\n\n", ss_name, sp->value); + printf("\t/* event mask array */ EM_%s_%s},\n\n", ss_name, sp->value); return; } @@ -358,7 +359,7 @@ gen_ss_array() printf("\n\n"); nss++; - printf("\t/* State set \"%s\"*/\n", ssp->value); + printf("\t/* State set \"%s\" */ {\n", ssp->value); printf("\t/* ss name */ \"%s\",\n", ssp->value); @@ -367,7 +368,7 @@ gen_ss_array() nstates = exprCount(ssp->left); printf("\t/* number of states */ %d,\n", nstates, ssp->value); - printf("\t/* error state */ %d,\n", find_error_state(ssp)); + printf("\t/* error state */ %d},\n", find_error_state(ssp)); } printf("};\n"); diff --git a/src/sequencer/phase2.c b/src/sequencer/phase2.c index 676c510da..fda9467a2 100644 --- a/src/sequencer/phase2.c +++ b/src/sequencer/phase2.c @@ -16,6 +16,7 @@ 01mar94,ajk Implemented assignment of array elements to db channels. 01mar94,ajk Changed algorithm for assigning event bits. 13jan98,wfl Supported E_COMMA token (for compound expressions). +09mar98,wfl Avoided compilation warnings under Tornado ***************************************************************************/ /*#define DEBUG 1*/ @@ -114,7 +115,6 @@ gen_preamble() /* Forward references of tables: */ printf("\nextern struct seqProgram %s;\n", prog_name); - printf("extern struct seqChan seqChan[];\n"); return; }