From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 1 Jun 2009 18:14:36 +0000 (-0400)
Subject: hush: unify syntax_error_unterm_{ch,str} a bit
X-Git-Tag: 1_15_0~199
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6a46ab8b8fe3547cf9de4c0ff7e9420d87f8a3cb;p=oweals%2Fbusybox.git

hush: unify syntax_error_unterm_{ch,str} a bit

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---

diff --git a/shell/hush.c b/shell/hush.c
index 4c45e6559..e3f7b6eb7 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];