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

Fix bug 642 by replacing strstr() by search_plain_identifier()

This commit is contained in:
Holger Vogt 2023-08-17 17:18:18 +02:00
parent 7dd44f12e0
commit ca4ddf6bbc
1 changed files with 42 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/frontend/inpcom.c
View File

@ -7963,13 +7963,14 @@ static int inp_vdmos_model(struct card *deck)
for (card = deck; card; card = card->nextcard) { for (card = deck; card; card = card->nextcard) {
char* curr_line, * cut_line, * token, * new_line; char* curr_line, * cut_line = NULL, * token, * new_line;
wordlist* wl = NULL, * wlb; wordlist* wl = NULL, * wlb;
curr_line = cut_line = card->line; curr_line = card->line;
if (ciprefix(".model", curr_line) && strstr(curr_line, "vdmos")) { if (ciprefix(".model", curr_line)) {
cut_line = strstr(curr_line, "vdmos"); cut_line = search_plain_identifier(curr_line, "vdmos");
if (cut_line) {
wl_append_word(&wl, &wl, copy_substring(curr_line, cut_line)); wl_append_word(&wl, &wl, copy_substring(curr_line, cut_line));
wlb = wl; wlb = wl;
if (strstr(cut_line, "pchan")) { if (strstr(cut_line, "pchan")) {
@ -8012,6 +8013,7 @@ static int inp_vdmos_model(struct card *deck)
vmodels[j] = NULL; vmodels[j] = NULL;
} }
} }
}
/* we don't have vdmos models, so return */ /* we don't have vdmos models, so return */
if (vmodels[0] == NULL) if (vmodels[0] == NULL)