From: Glenn L McGrath <bug1@ihug.co.nz>
Date: Wed, 21 Jul 2004 10:20:19 +0000 (-0000)
Subject: Patch from Jean Wolter, fixes compiler warning when ASH_ALIAS is
X-Git-Tag: 1_00_rc2~32
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=28939ade2dbfdf5e970ed66a79f2a004ac8eb4b4;p=oweals%2Fbusybox.git

Patch from Jean Wolter, fixes compiler warning when ASH_ALIAS is
disabled.
---

diff --git a/shell/ash.c b/shell/ash.c
index da78965ea..fd616ef4a 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -5953,33 +5953,6 @@ varunset(const char *end, const char *var, const char *umsg, int varflags)
 
 static void pushfile(void);
 
-/*
- * Read a line from the script.
- */
-
-static inline char *
-pfgets(char *line, int len)
-{
-	char *p = line;
-	int nleft = len;
-	int c;
-
-	while (--nleft > 0) {
-		c = pgetc2();
-		if (c == PEOF) {
-			if (p == line)
-				return NULL;
-			break;
-		}
-		*p++ = c;
-		if (c == '\n')
-			break;
-	}
-	*p = '\0';
-	return line;
-}
-
-
 /*
  * Read a character from the script, returning PEOF on end of file.
  * Nul characters in the input are silently discarded.
@@ -6024,6 +5997,33 @@ static inline int pgetc2(void)
 }
 #endif
 
+/*
+ * Read a line from the script.
+ */
+
+static inline char *
+pfgets(char *line, int len)
+{
+	char *p = line;
+	int nleft = len;
+	int c;
+
+	while (--nleft > 0) {
+		c = pgetc2();
+		if (c == PEOF) {
+			if (p == line)
+				return NULL;
+			break;
+		}
+		*p++ = c;
+		if (c == '\n')
+			break;
+	}
+	*p = '\0';
+	return line;
+}
+
+
 
 #ifdef CONFIG_FEATURE_COMMAND_EDITING
 static const char *cmdedit_prompt;