From 99dcc20c0ad6782301918abf1593c68e6d2e5d35 Mon Sep 17 00:00:00 2001 From: Tim Edwards Date: Fri, 25 Jun 2021 10:27:24 -0400 Subject: [PATCH] Corrected MatchPins so that it returns an error code of 0 when pins are swapped, so that if pin names are swapped on the top level, netgen will report this as a final error message. Otherwise, the mismatch is only reported back in the pin list where it is not obvious. --- VERSION | 2 +- base/netcmp.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 66dd59a..af0cfc2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.5.190 +1.5.191 diff --git a/base/netcmp.c b/base/netcmp.c index 5c0b75f..6bdd803 100644 --- a/base/netcmp.c +++ b/base/netcmp.c @@ -7225,8 +7225,13 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2, int dolist) snprintf(ostr, left_col_end, "%s", obn->name); if ((*matchfunc)(obn->name, obp->name)) snprintf(ostr + left_col_end + 1, left_col_end, "%s", obp->name); - else + else { snprintf(ostr + left_col_end + 1, left_col_end, "%s **Mismatch**", obp->name); + /* Pins with different names are on different nets, + * so this should trigger an error return code. + */ + result = 0; + } for (m = 0; m < right_col_end + 1; m++) if (*(ostr + m) == '\0') *(ostr + m) = ' '; Fprintf(stdout, ostr);