[INPUT] Kill pgetc_macro

pgetc_macro is identical to pgetc except that it's a macro and
pgetc isn't.  Since there is very little performance difference
on modern systems it's time to kill pgetc_macro.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

3 files changed, 7 insertions, 7 deletions

diff --git a/src/input.c b/src/input.c
index d31c45b..9e533a4 100644
--- a/src/input.c
+++ b/src/input.c
@@ -134,7 +134,10 @@ RESET {
 int
 pgetc(void)
 {
-	return pgetc_macro();
+	if (--parsenleft >= 0)
+		return (signed char)*parsenextc++;
+	else
+		return preadbuffer();
 }
 
 
@@ -147,7 +150,7 @@ pgetc2()
 {
 	int c;
 	do {
-		c = pgetc_macro();
+		c = pgetc();
 	} while (c == PEOA);
 	return c;
 }
diff --git a/src/input.h b/src/input.h
index 50a7797..775291b 100644
--- a/src/input.h
+++ b/src/input.h
@@ -61,6 +61,3 @@ void setinputstring(char *);
 void popfile(void);
 void popallfiles(void);
 void closescript(void);
-
-#define pgetc_macro() \
-	(--parsenleft >= 0 ? (signed char)*parsenextc++ : preadbuffer())
diff --git a/src/parser.c b/src/parser.c
index 572cbcd..c4eaae2 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -775,7 +775,7 @@ xxreadtoken(void)
 		setprompt(2);
 	}
 	for (;;) {	/* until token or start of word found */
-		c = pgetc_macro();
+		c = pgetc();
 		switch (c) {
 		case ' ': case '\t':
 		case PEOA:
@@ -1009,7 +1009,7 @@ quotemark:
 					USTPUTC(c, out);
 				}
 			}
-			c = pgetc_macro();
+			c = pgetc();
 		}
 	}
 endword: