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

Reemove needless code, check for '}0', 

don't do anything here if not true m=something
This commit is contained in:
Holger Vogt 2023-08-12 14:55:48 +02:00
parent 2f369d5435
commit 0db8d3b956
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/frontend/inpcom.c
View File

@ -5556,18 +5556,18 @@ static char* eval_m(char* line, char* tline) {
double m; double m;
char* str_ptr, * m_ptr, * m_str = NULL; char* str_ptr, * m_ptr, * m_str = NULL;
char* cut_line = line; char* cut_line = line;
str_ptr = strstr(cut_line, "m="); str_ptr = strstr(cut_line, " m=");
if (str_ptr) { if (str_ptr) {
/* We need to have 'm=something */ /* We need to have 'm=something */
if (str_ptr[2]) { if (str_ptr[3]) {
m_ptr = str_ptr + 2; m_ptr = str_ptr + 3;
int error = 0; int error = 0;
m = INPevaluate(&m_ptr, &error, 1); m = INPevaluate(&m_ptr, &error, 1);
/*We have a value and create the m string */ /*We have a value and create the m string */
if (error == 0) { if (error == 0) {
m_str = tprintf("m=%15.8e", m); m_str = tprintf("m=%15.8e", m);
} }
else if (error == 1 && *m_ptr == '{' && m_ptr + 1 && *(m_ptr + 1) != '}') { else if (error == 1 && *m_ptr == '{' && *(m_ptr + 1) != '\0' && *(m_ptr + 1) != '}') {
char* bra = gettok_char(&m_ptr, '}', TRUE, TRUE); char* bra = gettok_char(&m_ptr, '}', TRUE, TRUE);
if (bra) { if (bra) {
m_str = tprintf("m=%s", bra); m_str = tprintf("m=%s", bra);
@ -5598,18 +5598,18 @@ static char* eval_mvalue(char* line, char* tline) {
double m; double m;
char* str_ptr, * m_ptr, * m_str = NULL; char* str_ptr, * m_ptr, * m_str = NULL;
char* cut_line = line; char* cut_line = line;
str_ptr = strstr(cut_line, "m="); str_ptr = strstr(cut_line, " m=");
if (str_ptr) { if (str_ptr) {
/* We need to have 'm=something */ /* We need to have 'm=something */
if (str_ptr[2]) { if (str_ptr[3]) {
m_ptr = str_ptr + 2; m_ptr = str_ptr + 3;
int error = 0; int error = 0;
m = INPevaluate(&m_ptr, &error, 1); m = INPevaluate(&m_ptr, &error, 1);
/*We have a value and create the m string */ /*We have a value and create the m string */
if (error == 0) { if (error == 0) {
m_str = tprintf("%15.8e", m); m_str = tprintf("%15.8e", m);
} }
else if (error == 1 && *m_ptr == '{' && m_ptr + 1 && *(m_ptr + 1) != '}') { else if (error == 1 && *m_ptr == '{' && *(m_ptr + 1) != '\0' && *(m_ptr + 1) != '}') {
char* bra = gettok_char(&m_ptr, '}', TRUE, TRUE); char* bra = gettok_char(&m_ptr, '}', TRUE, TRUE);
if (bra) { if (bra) {
m_str = tprintf("%s", bra); m_str = tprintf("%s", bra);