stripbraces(), make `s' constant in the region of interest
This commit is contained in:
parent
170aa84f47
commit
fc45b3addf
|
|
@ -93,17 +93,18 @@ stripbraces(SPICE_DSTRINGPTR dstr_p)
|
||||||
/* puts the funny placeholders. returns the number of {...} substitutions */
|
/* puts the funny placeholders. returns the number of {...} substitutions */
|
||||||
{
|
{
|
||||||
int n, i, nest, j;
|
int n, i, nest, j;
|
||||||
char *s; /* value of dynamic string */
|
char *s0; /* value of dynamic string */
|
||||||
char *brace;
|
char *brace;
|
||||||
SPICE_DSTRING tstr; /* temporary dynamic string */
|
SPICE_DSTRING tstr; /* temporary dynamic string */
|
||||||
|
|
||||||
n = 0;
|
n = 0;
|
||||||
spice_dstring_init(&tstr);
|
spice_dstring_init(&tstr);
|
||||||
s = spice_dstring_value(dstr_p);
|
s0 = spice_dstring_value(dstr_p);
|
||||||
i = 0;
|
i = 0;
|
||||||
|
|
||||||
while ((brace = strchr(s + i, '{')) != NULL) {
|
while ((brace = strchr(s0 + i, '{')) != NULL) {
|
||||||
|
|
||||||
|
char * const s = s0;
|
||||||
i = (int) (brace - s);
|
i = (int) (brace - s);
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -139,7 +140,7 @@ stripbraces(SPICE_DSTRINGPTR dstr_p)
|
||||||
int ilen = spice_dstring_length(&tstr);
|
int ilen = spice_dstring_length(&tstr);
|
||||||
sadd(&tstr, s + j);
|
sadd(&tstr, s + j);
|
||||||
scopyd(dstr_p, &tstr);
|
scopyd(dstr_p, &tstr);
|
||||||
s = spice_dstring_value(dstr_p);
|
s0 = spice_dstring_value(dstr_p);
|
||||||
i = ilen;
|
i = ilen;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue