nupa_substitute(), fix lvalue and cleanup
This commit is contained in:
parent
ac59410602
commit
cc02b9ae2d
|
|
@ -1182,7 +1182,7 @@ nupa_substitute(dico_t *dico, const char *s, char * const r)
|
||||||
bug: wont flag overflow!
|
bug: wont flag overflow!
|
||||||
*/
|
*/
|
||||||
{
|
{
|
||||||
int (r_ - r) = 0;
|
char *r_ = r;
|
||||||
bool err = 0;
|
bool err = 0;
|
||||||
|
|
||||||
SPICE_DSTRING qstr; /* temp result dynamic string */
|
SPICE_DSTRING qstr; /* temp result dynamic string */
|
||||||
|
|
@ -1230,7 +1230,7 @@ nupa_substitute(dico_t *dico, const char *s, char * const r)
|
||||||
}
|
}
|
||||||
|
|
||||||
s = kptr + 1;
|
s = kptr + 1;
|
||||||
(r_ - r) = (r_ - r) + (int) (insertnumber(dico, r + (r_ - r), &qstr) - (r + (r_ - r)));
|
r_ = r_ + (int) (insertnumber(dico, r_, &qstr) - r_);
|
||||||
|
|
||||||
} else if (c == Intro) {
|
} else if (c == Intro) {
|
||||||
/* skip "&&" which may occur in B source */
|
/* skip "&&" which may occur in B source */
|
||||||
|
|
@ -1290,7 +1290,7 @@ nupa_substitute(dico_t *dico, const char *s, char * const r)
|
||||||
s = kptr;
|
s = kptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
(r_ - r) = (r_ - r) + (int) (insertnumber(dico, r + (r_ - r), &qstr) - (r + (r_ - r)));
|
r_ = r_ + (int) (insertnumber(dico, r_, &qstr) - r_);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue