search for: 1b20850a

...mon case and is now marked as likely. Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au> Signed-off-by: Ben Hutchings <ben at decadent.org.uk> --- usr/dash/output.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/dash/output.c b/usr/dash/output.c index 1b20850a..3e1ae256 100644 --- a/usr/dash/output.c +++ b/usr/dash/output.c @@ -144,7 +144,7 @@ outmem(const char *p, size_t len, struct output *dest) size_t nleft; nleft = dest->end - dest->nextc; - if (nleft >= len) { + if (likely(nleft >= len)) { buffered: dest->nextc = mempcpy(des...

...@@ -462,8 +507,7 @@ echocmd(int argc, char **argv) do { int c; - nonl += conv_escape_str(*argv); - outstr(stackblock(), outs); + nonl += print_escape_str("%s", NULL, NULL, *argv); if (nonl > 0) break; diff --git a/usr/dash/output.c b/usr/dash/output.c index f62e7eab..1b20850a 100644 --- a/usr/dash/output.c +++ b/usr/dash/output.c @@ -99,9 +99,6 @@ struct output *out1 = &output; struct output *out2 = &errout; -#ifndef USE_GLIBC_STDIO -static void __outstr(const char *, size_t, struct output *); -#endif static int xvsnprintf(char *, size_t, const char *, va_...