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

src/frontend/com_measure2.c, cleanup, rewrite `correct_vec()'

This commit is contained in:
rlar 2015-03-22 19:15:57 +01:00
parent 27aae75ade
commit 64da5a99bf
1 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/frontend/com_measure2.c
View File

@ -86,33 +86,24 @@ measure_errMessage(char *mName, char *mFunction, char *trigTarg, char *errMsg, i
static void
correct_vec(MEASUREPTR meas)
{
char *vec, *vecfirst, newvec[BSIZE_SP];
char *vec2, newvec2[BSIZE_SP];
char *vec = meas->m_vec;
vec = meas->m_vec;
/* return if not of type VM() etc */
if ((*vec != 'v') || (!strstr(vec, "(")))
return;
if (*(++vec) != '(') {
vecfirst = copy(meas->m_vec);
vecfirst[1] = '\0';
meas->m_vectype = *vec;
sprintf(newvec, "%s%s", vecfirst, strstr(meas->m_vec, "("));
tfree(meas->m_vec);
tfree(vecfirst);
meas->m_vec = copy(newvec);
if (vec[1] != '(') {
meas->m_vectype = vec[1];
meas->m_vec = tprintf("%c%s", vec[0], strstr(vec, "("));
tfree(vec);
}
vec2 = meas->m_vec2;
if (vec2 && (*(++vec2) != '(')) {
vecfirst = copy(meas->m_vec2);
vecfirst[1] = '\0';
meas->m_vectype2 = *vec2;
sprintf(newvec, "%s%s", vecfirst, strstr(meas->m_vec2, "("));
tfree(meas->m_vec2);
tfree(vecfirst);
meas->m_vec2 = copy(newvec2);
vec = meas->m_vec2;
if (vec && (vec[1] != '(')) {
meas->m_vectype2 = vec[1];
meas->m_vec2 = tprintf("%c%s", vec[0], strstr(vec, "("));
tfree(vec);
}
}