From 7c9861214b2d81603902d344cfdef3342d8d4b5b Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Sat, 4 Apr 2009 12:15:42 +0000 Subject: [PATCH] hush: remove CHAR_xxx constants --- shell/hush.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/shell/hush.c b/shell/hush.c index a57d5d811..6ae42c8b5 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -426,13 +426,6 @@ typedef struct in_str { #define i_getch(input) ((input)->get(input)) #define i_peek(input) ((input)->peek(input)) -enum { - CHAR_ORDINARY = 0, - CHAR_ORDINARY_IF_QUOTED = 1, /* example: *, # */ - CHAR_IFS = 2, /* treated as ordinary if quoted */ - CHAR_SPECIAL = 3, /* \, $, ", maybe ` */ -}; - enum { BC_BREAK = 1, BC_CONTINUE = 2, @@ -4132,7 +4125,6 @@ static int parse_stream_dquoted(o_string *dest, struct in_str *input, int dquote } debug_printf_parse(": ch=%c (%d) m=%d escape=%d\n", ch, ch, m, dest->o_escape); - /* Basically, checking every CHAR_SPECIAL char except '"' */ if (ch == '\\') { if (next == EOF) { syntax("\\"); @@ -4292,7 +4284,7 @@ static struct pipe *parse_stream(struct in_str *input, int end_trigger) done_pipe(&ctx, PIPE_SEQ); dest.o_assignment = MAYBE_ASSIGNMENT; ch = ';'; - /* note: if (m == CHAR_IFS) continue; + /* note: if (is_ifs) continue; * will still trigger for us */ } }