diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Src/parse.c | 15 |
2 files changed, 7 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index 4db9df49b..420eb261d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2016-03-07 Peter Stephenson <p.stephenson@samsung.com> + * 38111: Src/parse.c: remove redundant return values from + par_list() and par_list1(). + * users/21352: Src/subst.c, Test/A03quoting.ztst: use nulstring to ensure $'' isn't elided. diff --git a/Src/parse.c b/Src/parse.c index 349d1e427..94ac04922 100644 --- a/Src/parse.c +++ b/Src/parse.c @@ -718,7 +718,7 @@ set_sublist_code(int p, int type, int flags, int skip, int cmplx) */ /**/ -static int +static void par_list(int *cmplx) { int p, lp = -1, c; @@ -747,19 +747,15 @@ par_list(int *cmplx) goto rec; } else set_list_code(p, (Z_SYNC | Z_END), c); - return 1; } else { ecused--; - if (lp >= 0) { + if (lp >= 0) ecbuf[lp] |= wc_bdata(Z_END); - return 1; - } - return 0; } } /**/ -static int +static void par_list1(int *cmplx) { int p = ecadd(0), c = 0; @@ -767,11 +763,8 @@ par_list1(int *cmplx) if (par_sublist(&c)) { set_list_code(p, (Z_SYNC | Z_END), c); *cmplx |= c; - return 1; - } else { + } else ecused--; - return 0; - } } /* |