diff --git a/extract/ExtArray.c b/extract/ExtArray.c index 605a6451..beb2b32c 100644 --- a/extract/ExtArray.c +++ b/extract/ExtArray.c @@ -377,7 +377,7 @@ extArrayProcess(ha, primary) DBWFeedbackAdd(primary, "System error: expected array element but none found", ha->ha_parentUse->cu_def, 1, STYLE_MEDIUMHIGHLIGHTS); - extNumFatal++; + extNumErrors++; return; } if (SigInterruptPending) goto done; @@ -802,7 +802,7 @@ extArrayTileToNode(tp, pNum, et, ha, doHard) /* Blew it */ if (!doHard) return ((char *) NULL); - extNumFatal++; + extNumErrors++; TiToRect(tp, &r); if (!DebugIsSet(extDebugID, extDebNoFeedback)) DBWFeedbackAdd(&r, errorStr, ha->ha_parentUse->cu_def, 1, diff --git a/extract/ExtCell.c b/extract/ExtCell.c index bb470f6a..f3cd2b27 100644 --- a/extract/ExtCell.c +++ b/extract/ExtCell.c @@ -76,9 +76,9 @@ void extHeader(); * Side effects: * Creates the file 'outName'.ext and writes to it. * May leave feedback information where errors were encountered. - * Upon return, extNumFatal contains the number of fatal errors - * encountered while extracting 'def', and extNumWarnings contains - * the number of warnings. + * Upon return, extNumErrors contains the number of (likely serious) + * errors encountered while extracting 'def', and extNumWarnings + * contains the number of warnings. * * ---------------------------------------------------------------------------- */ @@ -115,16 +115,16 @@ ExtCell(def, outName, doLength) return NULL; } - extNumFatal = extNumWarnings = 0; + extNumErrors = extNumWarnings = 0; savePlane = extCellFile(def, f, doLength); (void) fclose(f); - if (extNumFatal > 0 || extNumWarnings > 0) + if (extNumErrors > 0 || extNumWarnings > 0) { TxPrintf("%s:", def->cd_name); - if (extNumFatal > 0) + if (extNumErrors > 0) TxPrintf(" %d fatal error%s", - extNumFatal, extNumFatal != 1 ? "s" : ""); + extNumErrors, extNumErrors != 1 ? "s" : ""); if (extNumWarnings > 0) TxPrintf(" %d warning%s", extNumWarnings, extNumWarnings != 1 ? "s" : ""); @@ -366,7 +366,7 @@ ExtRevertSubstrate(def, savePlane) * * Side effects: * May leave feedback information where errors were encountered. - * Upon return, extNumFatal has been incremented by the number of + * Upon return, extNumErrors has been incremented by the number of * fatal errors encountered while extracting 'def', and extNumWarnings * by the number of warnings. * diff --git a/extract/ExtHier.c b/extract/ExtHier.c index 83b58587..3ffd3767 100644 --- a/extract/ExtHier.c +++ b/extract/ExtHier.c @@ -540,7 +540,7 @@ extHierConnectFunc2(cum, ha) } else if (r.r_xtop > r.r_xbot && r.r_ytop > r.r_ybot) { - extNumFatal++; + extNumErrors++; if (!DebugIsSet(extDebugID, extDebNoFeedback)) DBWFeedbackAdd(&r, "Illegal overlap (types do not connect)", ha->ha_parentUse->cu_def, 1, STYLE_MEDIUMHIGHLIGHTS); @@ -642,7 +642,7 @@ extHierConnectFunc3(cum, ha) } else if (r.r_xtop > r.r_xbot && r.r_ytop > r.r_ybot) { - extNumFatal++; + extNumErrors++; if (!DebugIsSet(extDebugID, extDebNoFeedback)) DBWFeedbackAdd(&r, "Illegal overlap (types do not connect)", ha->ha_parentUse->cu_def, 1, STYLE_MEDIUMHIGHLIGHTS); diff --git a/extract/ExtMain.c b/extract/ExtMain.c index 7a081f85..022d3aac 100644 --- a/extract/ExtMain.c +++ b/extract/ExtMain.c @@ -67,7 +67,7 @@ CellDef *extYdefCum = NULL; ClientData extDebugID; /* Number of errors encountered during extraction */ -int extNumFatal; +int extNumErrors; int extNumWarnings; /* Dummy use pointing to def being extracted */ @@ -662,7 +662,7 @@ extExtractStack(stack, doExtract, rootDef) Stack *stack; CellDef *rootDef; { - int fatal = 0, warnings = 0; + int errorcnt = 0, warnings = 0; bool first = TRUE; Plane *savePlane; CellDef *def; @@ -685,7 +685,7 @@ extExtractStack(stack, doExtract, rootDef) sl = newsl; } - fatal += extNumFatal; + errorcnt += extNumErrors; warnings += extNumWarnings; } else @@ -714,9 +714,9 @@ extExtractStack(stack, doExtract, rootDef) } else { - if (fatal > 0) + if (errorcnt > 0) TxError("Total of %d error%s (check feedback entries).\n", - fatal, fatal != 1 ? "s" : ""); + errorcnt, errorcnt != 1 ? "s" : ""); if (warnings > 0) TxError("Total of %d warning%s.\n", warnings, warnings != 1 ? "s" : ""); diff --git a/extract/ExtSubtree.c b/extract/ExtSubtree.c index f013c968..24196d05 100644 --- a/extract/ExtSubtree.c +++ b/extract/ExtSubtree.c @@ -1061,7 +1061,7 @@ extSubtreeTileToNode(tp, pNum, et, ha, doHard) return (extNodeName(reg)); } - extNumFatal++; + extNumErrors++; if (!DebugIsSet(extDebugID, extDebNoFeedback)) DBWFeedbackAdd(&r, errorStr, parentDef, 1, STYLE_MEDIUMHIGHLIGHTS); return ("(none)"); diff --git a/extract/extractInt.h b/extract/extractInt.h index ad33cce5..568df727 100644 --- a/extract/extractInt.h +++ b/extract/extractInt.h @@ -1059,7 +1059,7 @@ extern void extMakeNodeNumPrint(); /* --------------------- Miscellaneous globals ------------------------ */ -extern int extNumFatal; /* Number fatal errors encountered so far */ +extern int extNumErrors; /* Number of errors encountered so far */ extern int extNumWarnings; /* Number warning messages so far */ extern CellUse *extParentUse; /* Dummy use for def being extracted */ extern ClientData extNbrUn; /* Ditto */ diff --git a/extract/extractInt.h.new b/extract/extractInt.h.new index 39335c89..3661c6b9 100644 --- a/extract/extractInt.h.new +++ b/extract/extractInt.h.new @@ -1026,7 +1026,7 @@ extern int extNbrPushFunc(); /* --------------------- Miscellaneous globals ------------------------ */ -extern int extNumFatal; /* Number fatal errors encountered so far */ +extern int extNumErrors; /* Number of errors encountered so far */ extern int extNumWarnings; /* Number warning messages so far */ extern CellUse *extParentUse; /* Dummy use for def being extracted */ extern ClientData extNbrUn; /* Ditto */