summary refs log tree commit diff
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2014-10-27 15:42:23 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2014-10-27 15:42:23 +0800
commit53151f00720d5cd2df8cf196f4523d4f5b831598 (patch)
tree9ab32b58d1e243c662be315161ce0214122fb7ad
parent[INPUT] Replace open-coded flushall in preadbuffer (diff)
downloaddash-53151f00720d5cd2df8cf196f4523d4f5b831598.tar.gz
dash-53151f00720d5cd2df8cf196f4523d4f5b831598.zip
[OUTPUT] Add likely tag in outmem
The branch in outmem where the string fits in the buffer is the
common case and is now marked as likely.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--ChangeLog1
-rw-r--r--src/output.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e6d6cbf..9d2dc7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
 	* Add printf support for format string a, A, and F.
 	* Handle embedded NULs correctly in printf.
 	* Replace open-coded flushall in preadbuffer.
+	* Add likely tag in outmem.
 
 2014-10-13  Eric Blake <eblake@redhat.com>
 
diff --git a/src/output.c b/src/output.c
index 1b20850..3e1ae25 100644
--- a/src/output.c
+++ b/src/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(dest->nextc, p, len);
 		return;