[git commit] vi: avoid build failure in non-default case

Denys Vlasenko vda.linux at googlemail.com
Wed Apr 3 14:20:13 UTC 2019


commit: https://git.busybox.net/busybox/commit/?id=3e61b59ef326cdb800736f502e0240b109271076
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

If vi is built with FEATURE_VI_USE_SIGNALS disabled and
FEATURE_VI_WIN_RESIZE enabled new_screen() is used without a
declaration.  Move the function to avoid this.

Signed-off-by: Ron Yorston <rmy at pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 editors/vi.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/editors/vi.c b/editors/vi.c
index b41cf451c..ce261feca 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -722,6 +722,22 @@ static void screen_erase(void)
 	memset(screen, ' ', screensize);	// clear new screen
 }
 
+static char *new_screen(int ro, int co)
+{
+	int li;
+
+	free(screen);
+	screensize = ro * co + 8;
+	screen = xmalloc(screensize);
+	// initialize the new screen. assume this will be a empty file.
+	screen_erase();
+	//   non-existent text[] lines start with a tilde (~).
+	for (li = 1; li < ro - 1; li++) {
+		screen[(li * co) + 0] = '~';
+	}
+	return screen;
+}
+
 //----- Synchronize the cursor to Dot --------------------------
 static NOINLINE void sync_cursor(char *d, int *row, int *col)
 {
@@ -2882,22 +2898,6 @@ static void colon(char *buf)
 //    TAB NEWLINE VT FF RETURN SPACE
 // DO NOT COUNT NEWLINE AS WHITESPACE
 
-static char *new_screen(int ro, int co)
-{
-	int li;
-
-	free(screen);
-	screensize = ro * co + 8;
-	screen = xmalloc(screensize);
-	// initialize the new screen. assume this will be a empty file.
-	screen_erase();
-	//   non-existent text[] lines start with a tilde (~).
-	for (li = 1; li < ro - 1; li++) {
-		screen[(li * co) + 0] = '~';
-	}
-	return screen;
-}
-
 static int st_test(char *p, int type, int dir, char *tested)
 {
 	char c, c0, ci;


More information about the busybox-cvs mailing list