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

insertnumber(), return char pointer instead of integer index

This commit is contained in:
rlar 2016-05-01 18:13:24 +02:00
parent 34e37f393c
commit 6a72c09b5f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1152,7 +1152,7 @@ evaluate_expr(dico_t *dico, SPICE_DSTRINGPTR qstr_p, const char *t, const char *
/********* interface functions for spice3f5 extension ***********/
static int
static char *
insertnumber(dico_t *dico, char * const s, SPICE_DSTRINGPTR ustr_p)
/* insert u in string s in place of the next placeholder number */
{
@ -1172,7 +1172,7 @@ insertnumber(dico_t *dico, char * const s, SPICE_DSTRINGPTR ustr_p)
(snprintf(buf, sizeof(buf), "%-25s", u) == ACT_CHARACTS))
{
memcpy(p, buf, ACT_CHARACTS);
return (int)(p - s) + ACT_CHARACTS;
return p + ACT_CHARACTS;
}
message
@ -1182,7 +1182,7 @@ insertnumber(dico_t *dico, char * const s, SPICE_DSTRINGPTR ustr_p)
s, u, id);
/* swallow everything on failure */
return (int) strlen(s);
return s + strlen(s);
}
@ -1239,7 +1239,7 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
s = kptr;
if (!err)
ir = ir + insertnumber(dico, r + ir, &qstr);
ir = ir + (int) (insertnumber(dico, r + ir, &qstr) - (r + ir));
else
err = message(dico, "Cannot compute substitute\n");
@ -1304,7 +1304,7 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
}
if (!err)
ir = ir + insertnumber(dico, r + ir, &qstr);
ir = ir + (int) (insertnumber(dico, r + ir, &qstr) - (r + ir));
else
message(dico, "Cannot compute &(expression)\n");
}