From: Rich Felker <dalias@aerifal.cx>
Date: Thu, 18 Oct 2018 03:38:29 +0000 (-0400)
Subject: optimize hot paths of putc with manual shrink-wrapping
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d664061adb4d7f6647ab2059bc351daa394bf5da;p=android-x86%2Fexternal-musl-libc.git

optimize hot paths of putc with manual shrink-wrapping

this is the analog of commit dd8f02b7dce53d6b1c4282439f1636a2d63bee01,
but for putc.
---

diff --git a/src/stdio/fputc.c b/src/stdio/fputc.c
index 92762c98..f364ed38 100644
--- a/src/stdio/fputc.c
+++ b/src/stdio/fputc.c
@@ -1,10 +1,7 @@
-#include "stdio_impl.h"
+#include <stdio.h>
+#include "putc.h"
 
 int fputc(int c, FILE *f)
 {
-	if (f->lock < 0 || !__lockfile(f))
-		return putc_unlocked(c, f);
-	c = putc_unlocked(c, f);
-	__unlockfile(f);
-	return c;
+	return do_putc(c, f);
 }
diff --git a/src/stdio/putc.c b/src/stdio/putc.c
index fa893496..4744d978 100644
--- a/src/stdio/putc.c
+++ b/src/stdio/putc.c
@@ -1,12 +1,9 @@
-#include "stdio_impl.h"
+#include <stdio.h>
+#include "putc.h"
 
 int putc(int c, FILE *f)
 {
-	if (f->lock < 0 || !__lockfile(f))
-		return putc_unlocked(c, f);
-	c = putc_unlocked(c, f);
-	__unlockfile(f);
-	return c;
+	return do_putc(c, f);
 }
 
 weak_alias(putc, _IO_putc);
diff --git a/src/stdio/putchar.c b/src/stdio/putchar.c
index 945636d5..f044f169 100644
--- a/src/stdio/putchar.c
+++ b/src/stdio/putchar.c
@@ -1,6 +1,7 @@
 #include <stdio.h>
+#include "putc.h"
 
 int putchar(int c)
 {
-	return fputc(c, stdout);
+	return do_putc(c, stdout);
 }