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 92762c98f8ccf28312140d0df717441483e15e79..f364ed38ba7471d3ca80f2d21560737eca642042 100644 (file)
--- 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 fa8934969b62de4c4ca99172d13f95f13fc3e0a8..4744d978725deb765850b7922b7b7d2aa02772f1 100644 (file)
--- 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 945636d5e66288cd23da8b4b5fb2390ec6583fa8..f044f16973b5748077b1536704cf322c94711ad8 100644 (file)
--- 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);
 }