nupa_substitute(), cleanup for loops
This commit is contained in:
parent
c06dddc4db
commit
ad603be96f
|
|
@ -1199,11 +1199,9 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
|
||||||
const char *kptr = s;
|
const char *kptr = s;
|
||||||
int nnest = 1;
|
int nnest = 1;
|
||||||
|
|
||||||
for (;; kptr++) {
|
for (; *kptr; kptr++) {
|
||||||
|
|
||||||
char d = *kptr;
|
char d = *kptr;
|
||||||
if (d == '\0')
|
|
||||||
break;
|
|
||||||
|
|
||||||
if (d == '{')
|
if (d == '{')
|
||||||
nnest++;
|
nnest++;
|
||||||
|
|
@ -1251,13 +1249,9 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
|
||||||
const char *kptr = s;
|
const char *kptr = s;
|
||||||
int level = 1;
|
int level = 1;
|
||||||
|
|
||||||
for (;; kptr++) {
|
for (; kptr < s_end; kptr++) {
|
||||||
|
|
||||||
char d;
|
char d = *kptr;
|
||||||
if (kptr >= s_end) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
d = *kptr;
|
|
||||||
|
|
||||||
if (d == '(')
|
if (d == '(')
|
||||||
level++;
|
level++;
|
||||||
|
|
@ -1281,11 +1275,9 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
|
||||||
/* simple identifier may also be string? */
|
/* simple identifier may also be string? */
|
||||||
|
|
||||||
const char *kptr = s;
|
const char *kptr = s;
|
||||||
for (;; kptr++) {
|
for (; kptr < s_end; kptr++) {
|
||||||
|
|
||||||
char d;
|
char d;
|
||||||
if (kptr >= s_end)
|
|
||||||
break;
|
|
||||||
d = *kptr;
|
d = *kptr;
|
||||||
|
|
||||||
if (d <= ' ') {
|
if (d <= ' ') {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue