stripbraces(), i ==> i_ptr - (const) s
This commit is contained in:
parent
186352b7e5
commit
d4dad0f10c
|
|
@ -105,11 +105,11 @@ stripbraces(SPICE_DSTRINGPTR dstr_p)
|
||||||
while ((brace = strchr(s0 + i, '{')) != NULL) {
|
while ((brace = strchr(s0 + i, '{')) != NULL) {
|
||||||
|
|
||||||
char * const s = s0;
|
char * const s = s0;
|
||||||
i = (int) (brace - s);
|
i_ptr - s = (int) (brace - s);
|
||||||
|
|
||||||
|
|
||||||
/* something to strip */
|
/* something to strip */
|
||||||
const char *j_ptr = s + i + 1;
|
const char *j_ptr = s + (i_ptr - s) + 1;
|
||||||
nest = 1;
|
nest = 1;
|
||||||
n++;
|
n++;
|
||||||
|
|
||||||
|
|
@ -121,9 +121,9 @@ stripbraces(SPICE_DSTRINGPTR dstr_p)
|
||||||
j_ptr++;
|
j_ptr++;
|
||||||
}
|
}
|
||||||
|
|
||||||
pscopy(&tstr, s, 0, i);
|
pscopy(&tstr, s, 0, (int) (i_ptr - s));
|
||||||
|
|
||||||
if (s[i - 1] > ' ')
|
if (s[(i_ptr - s) - 1] > ' ')
|
||||||
cadd(&tstr, ' ');
|
cadd(&tstr, ' ');
|
||||||
|
|
||||||
cadd(&tstr, ' ');
|
cadd(&tstr, ' ');
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue