From 495eef349d80e900b7d1126512c628b89ea5bf80 Mon Sep 17 00:00:00 2001 From: rlar Date: Wed, 27 Apr 2016 18:28:32 +0200 Subject: [PATCH] numparam/xpressn.c, nupa_subcktcall(), drop unused `err' argument --- src/frontend/numparam/numparam.h | 2 +- src/frontend/numparam/spicenum.c | 2 +- src/frontend/numparam/xpressn.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/frontend/numparam/numparam.h b/src/frontend/numparam/numparam.h index 859176176..b58f29b41 100644 --- a/src/frontend/numparam/numparam.h +++ b/src/frontend/numparam/numparam.h @@ -72,7 +72,7 @@ bool defsubckt(dico_t *, struct card *, nupa_type categ); int findsubckt(dico_t *, char *s); bool nupa_substitute(dico_t *, char *s, char *r, bool err); bool nupa_assignment(dico_t *, char *s, char mode); -bool nupa_subcktcall(dico_t *, char *s, char *x, bool err); +bool nupa_subcktcall(dico_t *, char *s, char *x); void nupa_subcktexit(dico_t *); dico_t *nupa_fetchinstance(void); nupa_type getidtype(dico_t *, char *s); diff --git a/src/frontend/numparam/spicenum.c b/src/frontend/numparam/spicenum.c index e3f82d361..9042621be 100644 --- a/src/frontend/numparam/spicenum.c +++ b/src/frontend/numparam/spicenum.c @@ -841,7 +841,7 @@ nupa_eval(struct card *card) idef = findsubckt(dicoS, s); if (idef > 0) - nupa_subcktcall(dicoS, dicoS->dynrefptr[idef], dicoS->dynrefptr[linenum], 0); + nupa_subcktcall(dicoS, dicoS->dynrefptr[idef], dicoS->dynrefptr[linenum]); else putlogfile('?', linenum, " illegal subckt call."); } else if (c == 'U') { /* release local symbols = parameters */ diff --git a/src/frontend/numparam/xpressn.c b/src/frontend/numparam/xpressn.c index a4829b007..881fde964 100644 --- a/src/frontend/numparam/xpressn.c +++ b/src/frontend/numparam/xpressn.c @@ -1534,7 +1534,7 @@ nupa_assignment(dico_t *dico, char *s, char mode) bool -nupa_subcktcall(dico_t *dico, char *s, char *x, bool err) +nupa_subcktcall(dico_t *dico, char *s, char *x) /* s= a subckt define line, with formal params. x= a matching subckt call line, with actual params */ @@ -1550,6 +1550,7 @@ nupa_subcktcall(dico_t *dico, char *s, char *x, bool err) char *t_p; char *u_p; bool found; + bool err = 0; spice_dstring_init(&subname); spice_dstring_init(&tstr);