From c5c1306f6aecbd9231aded27620c003c944787dc Mon Sep 17 00:00:00 2001 From: Tim Edwards Date: Wed, 9 Jun 2021 09:20:45 -0400 Subject: [PATCH] Corrected a minor error where the property mismatch check outputs an error message while doing a non-final iteration, where all output is supposed to be suppressed. --- VERSION | 2 +- base/netcmp.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index 3663b2b..bbf134e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.5.184 +1.5.185 diff --git a/base/netcmp.c b/base/netcmp.c index ab672ed..96a6171 100644 --- a/base/netcmp.c +++ b/base/netcmp.c @@ -5691,7 +5691,7 @@ PropertyMatch(struct objlist *ob1, int file1, #endif } - /* WIP---Check for no-connect pins in merged devices on both sides. */ + /* Check for no-connect pins in merged devices on both sides. */ /* Both sides should either have no-connects marked, or neither. */ /* (Permutable pins may need to be handled correctly. . . */ @@ -5746,10 +5746,12 @@ PropertyMatch(struct objlist *ob1, int file1, if ((t1type != PROPERTY) && (checked_one == TRUE)) { // t2 has more property records than t1, and they did not get // merged equally by PropertySortAndCombine(). - Fprintf(stdout, "Circuit 1 parallel/series network does not match" + if (do_print) { + Fprintf(stdout, "Circuit 1 parallel/series network does not match" " Circuit 2\n"); - DumpNetwork(ob1, 1); - DumpNetwork(ob2, 2); + DumpNetwork(ob1, 1); + DumpNetwork(ob2, 2); + } mismatches++; } else if (t1type != PROPERTY) {