mntent: Use __putc_unlocked instead of fputc_unlocked

Message ID 20210108142708.748960-1-siddhesh@sourceware.org
State Committed
Headers
Series mntent: Use __putc_unlocked instead of fputc_unlocked |

Commit Message

Siddhesh Poyarekar Jan. 8, 2021, 2:27 p.m. UTC
  __putc_unlocked is guaranteed to be inlined all the time as opposed to
fputc_unlocked, which does not get inlined when glibc is built with
-Os.
---
 misc/mntent_r.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
  

Comments

H.J. Lu Jan. 8, 2021, 2:42 p.m. UTC | #1
On Fri, Jan 8, 2021 at 6:28 AM Siddhesh Poyarekar via Libc-alpha
<libc-alpha@sourceware.org> wrote:
>
> __putc_unlocked is guaranteed to be inlined all the time as opposed to
> fputc_unlocked, which does not get inlined when glibc is built with
> -Os.
> ---
>  misc/mntent_r.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/misc/mntent_r.c b/misc/mntent_r.c
> index 30383a4a26..1005e143ab 100644
> --- a/misc/mntent_r.c
> +++ b/misc/mntent_r.c
> @@ -223,16 +223,16 @@ write_string (FILE *stream, const char *str)
>    while ((c = *str++) != '\0')
>      {
>        if (strchr (encode_chars, c) == NULL)
> -       fputc_unlocked (c, stream);
> +       __putc_unlocked (c, stream);
>        else
>         {
> -         fputc_unlocked ('\\', stream);
> -         fputc_unlocked (((c & 0xc0) >> 6) + '0', stream);
> -         fputc_unlocked (((c & 0x38) >> 3) + '0', stream);
> -         fputc_unlocked (((c & 0x07) >> 0) + '0', stream);
> +         __putc_unlocked ('\\', stream);
> +         __putc_unlocked (((c & 0xc0) >> 6) + '0', stream);
> +         __putc_unlocked (((c & 0x38) >> 3) + '0', stream);
> +         __putc_unlocked (((c & 0x07) >> 0) + '0', stream);
>         }
>      }
> -  fputc_unlocked (' ', stream);
> +  __putc_unlocked (' ', stream);
>  }
>
>  /* Write the mount table entry described by MNT to STREAM.
> --
> 2.29.2
>

LGTM.

Thanks.
  

Patch

diff --git a/misc/mntent_r.c b/misc/mntent_r.c
index 30383a4a26..1005e143ab 100644
--- a/misc/mntent_r.c
+++ b/misc/mntent_r.c
@@ -223,16 +223,16 @@  write_string (FILE *stream, const char *str)
   while ((c = *str++) != '\0')
     {
       if (strchr (encode_chars, c) == NULL)
-	fputc_unlocked (c, stream);
+	__putc_unlocked (c, stream);
       else
 	{
-	  fputc_unlocked ('\\', stream);
-	  fputc_unlocked (((c & 0xc0) >> 6) + '0', stream);
-	  fputc_unlocked (((c & 0x38) >> 3) + '0', stream);
-	  fputc_unlocked (((c & 0x07) >> 0) + '0', stream);
+	  __putc_unlocked ('\\', stream);
+	  __putc_unlocked (((c & 0xc0) >> 6) + '0', stream);
+	  __putc_unlocked (((c & 0x38) >> 3) + '0', stream);
+	  __putc_unlocked (((c & 0x07) >> 0) + '0', stream);
 	}
     }
-  fputc_unlocked (' ', stream);
+  __putc_unlocked (' ', stream);
 }
 
 /* Write the mount table entry described by MNT to STREAM.