numparam, #3/4, nupa_scan(), use struct card * argument

src/frontend/numparam/numpaif.h

@@ -16,7 +16,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_scan(char * s, int linenum, int is_subckt);
+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);
 extern void   nupa_add_param(char *param_name, double value);

src/frontend/numparam/spicenum.c

@@ -529,12 +529,12 @@ nupa_done(void)
 
 /* SJB - Scan the line for subcircuits */
 void
-nupa_scan(char *s, int linenum, int is_subckt)
+nupa_scan(struct card *card, int is_subckt)
 {
     if (is_subckt)
-        defsubckt(dicoS, s, linenum, 'U');
+        defsubckt(dicoS, card->line, card->linenum, 'U');
     else
-        defsubckt(dicoS, s, linenum, 'O');
+        defsubckt(dicoS, card->line, card->linenum, 'O');
 }
 
 

src/frontend/subckt.c

@@ -236,9 +236,9 @@ inp_subcktexpand(struct card *deck) {
         /* get the subckt/model names from the deck */
         for (c = deck; c; c = c->nextcard) {  /* first Numparam pass */
             if (ciprefix(".subckt", c->line))
-                nupa_scan(c->line, c->linenum, TRUE);
+                nupa_scan(c, TRUE);
             if (ciprefix(".model", c->line))
-                nupa_scan(c->line, c->linenum, FALSE);
+                nupa_scan(c, FALSE);
         }
         /* now copy instances */
         for (c = deck; c; c = c->nextcard)  /* first Numparam pass */