diff options
author | Mike Frysinger | 2009-06-01 14:14:36 -0400 |
---|---|---|
committer | Mike Frysinger | 2009-06-01 14:16:43 -0400 |
commit | 6a46ab8b8fe3547cf9de4c0ff7e9420d87f8a3cb (patch) | |
tree | f95bb98bcef465a75d14552bdab3c0ff7bb39a20 | |
parent | ef3e7fdd3b18ef3c43a58a06251eaf615e18a789 (diff) | |
download | busybox-6a46ab8b8fe3547cf9de4c0ff7e9420d87f8a3cb.zip busybox-6a46ab8b8fe3547cf9de4c0ff7e9420d87f8a3cb.tar.gz |
hush: unify syntax_error_unterm_{ch,str} a bit
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r-- | shell/hush.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/shell/hush.c b/shell/hush.c index 4c45e65..e3f7b6e 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -771,6 +771,11 @@ static void syntax_error_at(unsigned lineno, const char *msg) die_if_script(lineno, "syntax error at '%s'", msg); } +static void syntax_error_unterm_str(unsigned lineno, const char *s) +{ + die_if_script(lineno, "syntax error: unterminated %s", s); +} + /* It so happens that all such cases are totally fatal * even if shell is interactive: EOF while looking for closing * delimiter. There is nowhere to read stuff from after that, @@ -779,18 +784,11 @@ static void syntax_error_at(unsigned lineno, const char *msg) static void syntax_error_unterm_ch(unsigned lineno, char ch) NORETURN; static void syntax_error_unterm_ch(unsigned lineno, char ch) { - char msg[2]; - msg[0] = ch; - msg[1] = '\0'; - die_if_script(lineno, "syntax error: unterminated %s", msg); + char msg[2] = { ch, '\0' }; + syntax_error_unterm_str(lineno, msg); xfunc_die(); } -static void syntax_error_unterm_str(unsigned lineno, const char *s) -{ - die_if_script(lineno, "syntax error: unterminated %s", s); -} - static void syntax_error_unexpected_ch(unsigned lineno, int ch) { char msg[2]; |