From: "Gabriel F. T. Gomes" <gabriel@inconstante.eti.br>
To: Zack Weinberg <zackw@panix.com>
Cc: <libc-alpha@sourceware.org>
Subject: Re: [PATCH 5/9] Add __v*printf_internal with flags arguments.
Date: Mon, 26 Mar 2018 15:41:00 -0000 [thread overview]
Message-ID: <20180326124056.5e1c8c75@tereshkova> (raw)
In-Reply-To: <20180307193205.4751-6-zackw@panix.com>
On Wed, 07 Mar 2018, Zack Weinberg wrote:
> int
>-_IO_vdprintf (int d, const char *format, va_list arg)
>+__vdprintf_internal (int d, const char *format, va_list arg,
>+ unsigned int mode_flags)
~~~~~~~~~~~~~~~~
Spaces that could be converted to tabs.
> int
>-__IO_vsprintf (char *string, const char *format, va_list args)
>+__vsprintf_internal (char *string, const char *format, va_list args,
>+ unsigned int mode_flags)
~~~~~~~~~~~~~~~~
Likewise.
>--- a/libio/libio.h
>+++ b/libio/libio.h
>@@ -298,8 +298,6 @@ weak_extern (_IO_stdin_used);
>
> extern int _IO_vfwscanf (FILE * __restrict, const wchar_t * __restrict,
> __gnuc_va_list, int *__restrict);
>-extern int _IO_vfwprintf (FILE *__restrict, const wchar_t *__restrict,
>- __gnuc_va_list);
In the second patch in this series, you mentioned that _IO_vfwscanf was
being kept because external callers could theoretically exist. I don't
have the necessary background to understand why this doesn't apply to
_IO_vfwprintf, too. Doesn't it?
>+/* Internal versions of v*printf that take an additional flags
>+ parameter. */
>+extern int __vfprintf_internal (FILE *fp, const char *format, va_list ap,
>+ unsigned int mode_flags);
>+extern int __vfwprintf_internal (FILE *fp, const wchar_t *format, va_list ap,
>+ unsigned int mode_flags);
>+
>+extern int __vasprintf_internal (char **result_ptr, const char *format,
>+ va_list ap, unsigned int mode_flags);
>+extern int __vdprintf_internal (int d, const char *format, va_list ap,
>+ unsigned int mode_flags);
>+extern int __obstack_vprintf_internal (struct obstack *ob, const char *fmt,
>+ va_list ap, unsigned int mode_flags);
>+
>+extern int __vsprintf_internal (char *string, const char *format, va_list ap,
>+ unsigned int mode_flags);
>+extern int __vsnprintf_internal (char *string, size_t maxlen,
>+ const char *format, va_list ap,
>+ unsigned int mode_flags);
>+extern int __vswprintf_internal (wchar_t *string, size_t maxlen,
>+ const wchar_t *format, va_list ap,
>+ unsigned int mode_flags);
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In this block of function prototypes, some spaces that could be converted
to tabs.
> int
>-_IO_obstack_vprintf (struct obstack *obstack, const char *format, va_list args)
>+__obstack_vprintf_internal (struct obstack *obstack, const char *format,
>+ va_list args, unsigned int mode_flags)
~~~~~~~~~~~~~~~~~~~~~~~~
Likewise.
>- result = _IO_vfprintf (&new_f.ofile.file.file, format, args);
>+ result = __vfprintf_internal (&new_f.ofile.file.file, format, args,
>+ mode_flags);
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Likewise.
> int
>-_IO_vasprintf (char **result_ptr, const char *format, va_list args)
>+__vasprintf_internal (char **result_ptr, const char *format, va_list args,
>+ unsigned int mode_flags)
~~~~~~~~~~~~~~~~
Likewise.
> int
>-_IO_vsnprintf (char *string, size_t maxlen, const char *format,
>- va_list args)
>+__vsnprintf_internal (char *string, size_t maxlen, const char *format,
>+ va_list args, unsigned int mode_flags)
~~~~~~~~~~~~~~~~
Likewise.
>+int
>+___vsnprintf (char *string, size_t maxlen, const char *format, va_list args)
>+{
>+ return __vsnprintf_internal (string, maxlen, format, args, 0);
>+}
>+ldbl_weak_alias (___vsnprintf, __vsnprintf)
>+ldbl_hidden_def (___vsnprintf, __vsnprintf)
>+ldbl_weak_alias (___vsnprintf, vsnprintf)
OK.
> /* Helper function to provide temporary buffering for unbuffered streams. */
>-static int buffered_vfprintf (FILE *stream, const CHAR_T *fmt, va_list)
>+static int buffered_vfprintf (FILE *stream, const CHAR_T *fmt, va_list,
>+ unsigned int)
~~~~~~~~~~~~~~~~~~~~~~~~
Spaces instead of tabs.
>@@ -1223,7 +1230,9 @@ static int printf_positional (FILE *s,
> va_list ap, va_list *ap_savep, int done,
> int nspecs_done, const UCHAR_T *lead_str_end,
> CHAR_T *work_buffer, int save_errno,
>- const char *grouping, THOUSANDS_SEP_T);
>+ const char *grouping,
>+ THOUSANDS_SEP_T thousands_sep,
>+ unsigned int mode_flags);
~~~~~~~~~~~~~~~~~~~~~~~~
Likewise.
>@@ -1699,7 +1714,8 @@ printf_positional (FILE *s, const CHAR_T *format, int readonly_format,
> va_list ap, va_list *ap_savep, int done, int nspecs_done,
> const UCHAR_T *lead_str_end,
> CHAR_T *work_buffer, int save_errno,
>- const char *grouping, THOUSANDS_SEP_T thousands_sep)
>+ const char *grouping, THOUSANDS_SEP_T thousands_sep,
>+ unsigned int mode_flags)
~~~~~~~~~~~~~~~~
Likewise.
> static int
>-buffered_vfprintf (FILE *s, const CHAR_T *format, va_list args)
>+buffered_vfprintf (FILE *s, const CHAR_T *format, va_list args,
>+ unsigned int mode_flags)
~~~~~~~~~~~~~~~~
Likewise.
> /* Now print to helper instead. */
>-#ifndef COMPILE_WPRINTF
>- result = _IO_vfprintf (hp, format, args);
>-#else
>- result = vfprintf (hp, format, args);
>-#endif
>+ result = vfprintf (hp, format, args, mode_flags);
OK.
>--- a/stdlib/strfrom-skeleton.c
>+++ b/stdlib/strfrom-skeleton.c
>@@ -106,7 +106,7 @@ STRFROM (char *dest, size_t size, const char *format, FLOAT f)
> }
>
> /* The following code to prepare the virtual file has been adapted from the
>- function _IO_vsnprintf from libio. */
>+ function __vsnprintf from libio. */
~~~~~~~~~~~
It would be more precise to mention __vsnprint_internal.
next prev parent reply other threads:[~2018-03-26 15:41 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-07 19:32 [PATCH 0/9] Use more flags parameters instead of global bits in stdio Zack Weinberg
2018-03-07 19:32 ` [PATCH 2/9] Add __vfscanf_internal and __vfwscanf_internal with flags arguments Zack Weinberg
2018-03-13 12:35 ` Adhemerval Zanella
2018-06-29 14:04 ` Florian Weimer
2018-03-26 15:28 ` Gabriel F. T. Gomes
2018-06-29 14:12 ` Florian Weimer
2018-06-29 14:24 ` Florian Weimer
2018-06-29 14:29 ` Florian Weimer
2018-03-07 19:32 ` [PATCH 4/9] Use SCANF_LDBL_IS_DBL instead of __ldbl_is_dbl Zack Weinberg
2018-03-14 12:22 ` Florian Weimer
2018-03-26 15:36 ` Gabriel F. T. Gomes
2018-03-07 19:32 ` [PATCH 6/9] Add __vsyslog_internal, with same flags as __v*printf_internal Zack Weinberg
2018-03-13 11:59 ` Florian Weimer
2018-03-13 12:39 ` Zack Weinberg
2018-03-13 12:43 ` Florian Weimer
2018-03-13 13:37 ` Zack Weinberg
2018-03-13 13:50 ` Florian Weimer
2018-03-13 14:11 ` Zack Weinberg
2018-03-13 14:13 ` Florian Weimer
2018-03-07 19:32 ` [PATCH 5/9] Add __v*printf_internal with flags arguments Zack Weinberg
2018-03-26 15:41 ` Gabriel F. T. Gomes [this message]
2018-03-07 19:32 ` [PATCH 1/9] Use STRFMON_LDBL_IS_DBL instead of __ldbl_is_dbl Zack Weinberg
2018-03-12 20:36 ` Adhemerval Zanella
2018-03-12 21:11 ` Zack Weinberg
2018-03-13 11:45 ` Adhemerval Zanella
2018-03-26 15:17 ` Gabriel F. T. Gomes
2018-03-26 15:40 ` Zack Weinberg
2018-03-26 15:52 ` Gabriel F. T. Gomes
2018-03-07 19:32 ` [PATCH 8/9] Use PRINTF_LDBL_IS_DBL " Zack Weinberg
2018-03-07 19:32 ` [PATCH 3/9] Use SCANF_ISOC99_A instead of _IO_FLAGS2_SCANF_STD Zack Weinberg
2018-03-26 15:35 ` Gabriel F. T. Gomes
2018-03-07 19:51 ` [PATCH 7/9] Use PRINTF_FORTIFY instead of _IO_FLAGS2_FORTIFY Zack Weinberg
2018-03-07 19:51 ` [PATCH 9/9] Post-cleanup: don't include math.h/math_private.h in math_ldbl_opt.h Zack Weinberg
2018-03-12 15:29 ` [PATCH 0/9] Use more flags parameters instead of global bits in stdio Zack Weinberg
2018-03-26 15:16 ` Gabriel F. T. Gomes
2018-03-26 15:47 ` Zack Weinberg
2018-06-27 15:50 ` Florian Weimer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180326124056.5e1c8c75@tereshkova \
--to=gabriel@inconstante.eti.br \
--cc=libc-alpha@sourceware.org \
--cc=zackw@panix.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).