From 4f8bef997d3fea6954196ee937a887ad893257e7 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sat, 30 Apr 2016 21:10:14 +0200
Subject: [PATCH] numparam, nupa_signal(), drop useless return value

---
 src/frontend/numparam/numpaif.h  | 2 +-
 src/frontend/numparam/spicenum.c | 4 +---
 src/frontend/subckt.c            | 9 ++++-----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/frontend/numparam/numpaif.h b/src/frontend/numparam/numpaif.h
index 8731c9c3f..8c9b9ee1f 100644
--- a/src/frontend/numparam/numpaif.h
+++ b/src/frontend/numparam/numpaif.h
@@ -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);
diff --git a/src/frontend/numparam/spicenum.c b/src/frontend/numparam/spicenum.c
index 1848b1716..2fca7ec9c 100644
--- a/src/frontend/numparam/spicenum.c
+++ b/src/frontend/numparam/spicenum.c
@@ -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;
 }
diff --git a/src/frontend/subckt.c b/src/frontend/subckt.c
index 1265583b5..8c2840401 100644
--- a/src/frontend/subckt.c
+++ b/src/frontend/subckt.c
@@ -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.  */