From 6a72c09b5f83b8e0869aabd15848322f1d5e3498 Mon Sep 17 00:00:00 2001 From: rlar Date: Sun, 1 May 2016 18:13:24 +0200 Subject: [PATCH] insertnumber(), return char pointer instead of integer index --- src/frontend/numparam/xpressn.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/frontend/numparam/xpressn.c b/src/frontend/numparam/xpressn.c index c3416aa8c..a8516f3cb 100644 --- a/src/frontend/numparam/xpressn.c +++ b/src/frontend/numparam/xpressn.c @@ -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"); }