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

src/frontend/numparam/numparam.h

@@ -52,7 +52,7 @@ typedef struct {                /* the input scanner data structure */
 void initdico(dico_t *);
 int donedico(dico_t *);
 void dico_free_entry(entry_t *);
-bool defsubckt(dico_t *, char *s, int w, char categ);
+bool defsubckt(dico_t *, struct card *, char categ);
 int findsubckt(dico_t *, char *s, SPICE_DSTRINGPTR subname);
 bool nupa_substitute(dico_t *, char *s, char *r, bool err);
 bool nupa_assignment(dico_t *, char *s, char mode);

src/frontend/numparam/spicenum.c

@@ -532,9 +532,9 @@ void
 nupa_scan(struct card *card, int is_subckt)
 {
     if (is_subckt)
-        defsubckt(dicoS, card->line, card->linenum, 'U');
+        defsubckt(dicoS, card, 'U');
     else
-        defsubckt(dicoS, card->line, card->linenum, 'O');
+        defsubckt(dicoS, card, 'O');
 }
 
 

src/frontend/numparam/xpressn.c

@@ -538,11 +538,14 @@ nupa_define(dico_t *dico,
 
 
 bool
-defsubckt(dico_t *dico, char *s, int w, char categ)
+defsubckt(dico_t *dico, struct card *card, char categ)
 /* called on 1st pass of spice source code,
    to enter subcircuit (categ=U) and model (categ=O) names
 */
 {
+    char *s = card->line;
+    int w = card->linenum;
+
     bool err;
     int i, j, ls;