[klibc] [klibc:update-dash] [INPUT] Kill pgetc_macro
klibc-bot for Herbert Xu
herbert at gondor.apana.org.au
Thu Jan 24 19:15:14 PST 2019
Commit-ID: 7d9c9eed5207db8959f18272365d31093b9d2fab
Gitweb: http://git.kernel.org/?p=libs/klibc/klibc.git;a=commit;h=7d9c9eed5207db8959f18272365d31093b9d2fab
Author: Herbert Xu <herbert at gondor.apana.org.au>
AuthorDate: Mon, 29 Sep 2014 17:05:53 +0800
Committer: Ben Hutchings <ben at decadent.org.uk>
CommitDate: Fri, 25 Jan 2019 02:57:21 +0000
[klibc] [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 at gondor.apana.org.au>
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
---
usr/dash/input.c | 7 +++++--
usr/dash/input.h | 3 ---
usr/dash/parser.c | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/usr/dash/input.c b/usr/dash/input.c
index d31c45bb..9e533a47 100644
--- a/usr/dash/input.c
+++ b/usr/dash/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/usr/dash/input.h b/usr/dash/input.h
index 50a77971..775291b8 100644
--- a/usr/dash/input.h
+++ b/usr/dash/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/usr/dash/parser.c b/usr/dash/parser.c
index 572cbcd5..c4eaae2b 100644
--- a/usr/dash/parser.c
+++ b/usr/dash/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:
More information about the klibc
mailing list