[git commit master] hush: make it compile again :/

Denys Vlasenko vda.linux at googlemail.com
Mon Oct 19 11:20:52 UTC 2009


commit: http://git.busybox.net/busybox/commit/?id=8bc7f2c5aad9506a6dcd862a2f57d88b5c001a3e
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 shell/hush.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/shell/hush.c b/shell/hush.c
index 6ee1286..cbb0ce6 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -6174,8 +6174,8 @@ static struct pipe *parse_stream(char **pstring,
 			else {
 				/* It's "\<newline>". Remove trailing '\' from ctx.as_string */
 				ctx.as_string.data[--ctx.as_string.length] = '\0';
-#endif
 			}
+#endif
 			break;
 		case '$':
 			if (handle_dollar(&ctx.as_string, &dest, input) != 0) {
@@ -6915,14 +6915,14 @@ static int FAST_FUNC builtin_true(char **argv UNUSED_PARAM)
 	return 0;
 }
 
-static int FAST_FUNC run_applet_main(char **argv, int (*applet_main)(int argc, char **argv))
+static int run_applet_main(char **argv, int (*applet_main_func)(int argc, char **argv))
 {
 	int argc = 0;
 	while (*argv) {
 		argc++;
 		argv++;
 	}
-	return applet_main(argc, argv - argc);
+	return applet_main_func(argc, argv - argc);
 }
 
 static int FAST_FUNC builtin_test(char **argv)
-- 
1.6.3.3



More information about the busybox-cvs mailing list