luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

numparam, nupa_signal(), drop useless return value

This commit is contained in:
rlar 2016-04-30 21:10:14 +02:00
parent 5b194f1679
commit 4f8bef997d
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontend/numparam/numpaif.h
View File

@ -15,7 +15,7 @@ struct card;
extern char *nupa_copy(struct card *c);
extern int nupa_eval(struct card *card);
extern int nupa_signal(int sig, char *info);
extern void nupa_signal(int sig, char *info);
extern void nupa_scan(struct card *card, int is_subckt);
extern void nupa_list_params(FILE *cp_out);
extern double nupa_get_param(char *param_name, int *found);

4
src/frontend/numparam/spicenum.c
View File

@ -858,7 +858,7 @@ nupa_eval(struct card *card)
}
int
void
nupa_signal(int sig, char *info)
/* warning: deckcopy may come inside a recursion ! substart no! */
/* info is context-dependent string data */
@ -878,6 +878,4 @@ nupa_signal(int sig, char *info)
nupa_done();
firstsignalS = 1;
}
return 1;
}

9
src/frontend/subckt.c
View File

@ -205,7 +205,6 @@ free_global_nodes(void)
struct card *
inp_subcktexpand(struct card *deck) {
struct card *c;
int ok = 0;
wordlist *modnames = NULL;
if (!cp_getvar("substart", CP_STRING, start))
@ -232,7 +231,7 @@ inp_subcktexpand(struct card *deck) {
fprintf(stderr, "%3d:%s\n", c->linenum, c->line);
#endif
ok = nupa_signal(NUPADECKCOPY, NULL);
nupa_signal(NUPADECKCOPY, NULL);
/* get the subckt/model names from the deck */
for (c = deck; c; c = c->nextcard) { /* first Numparam pass */
if (ciprefix(".subckt", c->line))
@ -359,13 +358,13 @@ inp_subcktexpand(struct card *deck) {
if (ciprefix(invoke, c->line)) {
fprintf(cp_err, "Error: unknown subckt: %s\n", c->line);
if (use_numparams)
ok = ok && nupa_signal(NUPAEVALDONE, NULL);
nupa_signal(NUPAEVALDONE, NULL);
return NULL;
}
if (use_numparams) {
/* the NUMPARAM final line translation pass */
ok = ok && nupa_signal(NUPASUBDONE, NULL);
nupa_signal(NUPASUBDONE, NULL);
for (c = deck; c; c = c->nextcard)
/* 'param' .meas statements can have dependencies on measurement values */
/* need to skip evaluating here and evaluate after other .meas statements */
@ -383,7 +382,7 @@ inp_subcktexpand(struct card *deck) {
/*nupa_list_params(stdout);*/
nupa_copy_inst_dico();
ok = ok && nupa_signal(NUPAEVALDONE, NULL);
nupa_signal(NUPAEVALDONE, NULL);
}
return (deck); /* return the spliced deck. */