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

nupa_substitute(), drop s_

This commit is contained in:
rlar 2016-05-15 20:24:36 +02:00
parent 5416ecaab9
commit 81cb1ed674
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,7 +65,7 @@ int donedico(dico_t *);
void dico_free_entry(entry_t *); void dico_free_entry(entry_t *);
bool defsubckt(dico_t *, struct card *, nupa_type categ); bool defsubckt(dico_t *, struct card *, nupa_type categ);
int findsubckt(dico_t *, char *s); int findsubckt(dico_t *, char *s);
bool nupa_substitute(dico_t *, char *s, char *r); bool nupa_substitute(dico_t *, const char *s, char *r);
bool nupa_assignment(dico_t *, char *s, char mode); bool nupa_assignment(dico_t *, char *s, char mode);
bool nupa_subcktcall(dico_t *, char *s, char *x, char *inst_name); bool nupa_subcktcall(dico_t *, char *s, char *x, char *inst_name);
void nupa_subcktexit(dico_t *); void nupa_subcktexit(dico_t *);

6
src/frontend/numparam/xpressn.c
View File

@ -1187,7 +1187,7 @@ insertnumber(dico_t *dico, int i, char *s, SPICE_DSTRINGPTR ustr_p)
bool bool
nupa_substitute(dico_t *dico, char * const s_, char *r) nupa_substitute(dico_t *dico, const char *s, char *r)
/* s: pointer to original source line. /* s: pointer to original source line.
r: pointer to result line, already heavily modified wrt s r: pointer to result line, already heavily modified wrt s
anywhere we find a 10-char numstring in r, substitute it. anywhere we find a 10-char numstring in r, substitute it.
@ -1203,9 +1203,7 @@ nupa_substitute(dico_t *dico, char * const s_, char *r)
spice_dstring_init(&qstr); spice_dstring_init(&qstr);
spice_dstring_init(&tstr); spice_dstring_init(&tstr);
const char *s; const char * const s_end = strchr(s, '\0');
s = s_;
const char * const s_end = strchr(s_, '\0');
const char *kptr; const char *kptr;
while ((s < s_end) && !err) { while ((s < s_end) && !err) {