summaryrefslogtreecommitdiff
path: root/Src/subst.c
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2012-10-05 21:35:05 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2012-10-05 21:35:05 +0000
commiteb562c9f2c8af43957b023325119d912fa3897b3 (patch)
tree04a3a3d86ceffe87ca678d2c361fd27263ba2e39 /Src/subst.c
parent8781aad44870da32b3c59f5faa8a5a3e01a7027d (diff)
downloadzsh-eb562c9f2c8af43957b023325119d912fa3897b3.tar.gz
zsh-eb562c9f2c8af43957b023325119d912fa3897b3.zip
30715: use enum lextok for variables containing lexical tokens
Diffstat (limited to 'Src/subst.c')
-rw-r--r--Src/subst.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/Src/subst.c b/Src/subst.c
index b0c15d048..974a8456d 100644
--- a/Src/subst.c
+++ b/Src/subst.c
@@ -1215,7 +1215,7 @@ get_strarg(char *s, int *lenp)
{
convchar_t del;
int len;
- char tok = 0;
+ char ctok = 0;
MB_METACHARINIT();
len = MB_METACHARLENCONV(s, &del);
@@ -1243,25 +1243,25 @@ get_strarg(char *s, int *lenp)
del = ZWC('>');
break;
case Inpar:
- tok = Outpar;
+ ctok = Outpar;
break;
case Inang:
- tok = Outang;
+ ctok = Outang;
break;
case Inbrace:
- tok = Outbrace;
+ ctok = Outbrace;
break;
case Inbrack:
- tok = Outbrack;
+ ctok = Outbrack;
break;
}
- if (tok) {
+ if (ctok) {
/*
* Looking for a matching token; we want the literal byte,
* not a decoded multibyte character, so search specially.
*/
- while (*s && *s != tok)
+ while (*s && *s != ctok)
s++;
} else {
convchar_t del2;