mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03:00
Add __v*printf_internal with flags arguments
There are a lot more printf variants than there are scanf variants, and the code for setting up and tearing down their custom FILE variants around the call to __vf(w)printf is more complicated and variable. Therefore, I have added _internal versions of all the v*printf variants, rather than introducing helper routines so that they can all directly call __vf(w)printf_internal, as was done with scanf. As with the scanf changes, in this patch the _internal functions still look at the environmental mode bits and all callers pass 0 for the flags parameter. Several of the affected public functions had _IO_ name aliases that were not exported (but, in one case, appeared in libio.h anyway); I was originally planning to leave them as aliases to avoid having to touch internal callers, but it turns out ldbl_*_alias only work for exported symbols, so they've all been removed instead. It also turns out there were hardly any internal callers. _IO_vsprintf and _IO_vfprintf *are* exported, so those two stick around. Summary for the changes to each of the affected symbols: _IO_vfprintf, _IO_vsprintf: All internal calls removed, thus the internal declarations, as well as uses of libc_hidden_proto and libc_hidden_def, were also removed. The external symbol is now exposed via uses of ldbl_strong_alias to __vfprintf_internal and __vsprintf_internal, respectively. _IO_vasprintf, _IO_vdprintf, _IO_vsnprintf, _IO_vfwprintf, _IO_vswprintf, _IO_obstack_vprintf, _IO_obstack_printf: All internal calls removed, thus declaration in internal headers were also removed. They were never exported, so there are no aliases tying them to the internal functions. I.e.: entirely gone. __vsnprintf: Internal calls were always preceded by macros such as #define __vsnprintf _IO_vsnprintf, and #define __vsnprintf vsnprintf The macros were removed and their uses replaced with calls to the new internal function __vsnprintf_internal. Since there were no internal calls, the internal declaration was also removed. The external symbol is preserved with ldbl_weak_alias to ___vsnprintf. __vfwprintf: All internal calls converted into calls to __vfwprintf_internal, thus the internal declaration was removed. The function is now a wrapper that calls __vfwprintf_internal. The external symbol is preserved. __vswprintf: Similarly, but no external symbol. __vasprintf, __vdprintf, __vfprintf, __vsprintf: New internal wrappers. Not exported. vasprintf, vdprintf, vfprintf, vsprintf, vsnprintf, vfwprintf, vswprintf, obstack_vprintf, obstack_printf: These functions used to be aliases to the respective _IO_* function, they are now aliases to their respective __* functions. Tested for powerpc and powerpc64le.
This commit is contained in:
committed by
Gabriel F. T. Gomes
parent
d91798b31a
commit
698fb75b9f
@ -24,15 +24,13 @@
|
||||
This exception applies to code released by its copyright holders
|
||||
in files containing the exception. */
|
||||
|
||||
#include <malloc.h>
|
||||
#include <string.h>
|
||||
#include "libioP.h"
|
||||
#include "stdio.h"
|
||||
#include <stdio_ext.h>
|
||||
#include "strfile.h"
|
||||
#include <stdlib.h>
|
||||
#include <strfile.h>
|
||||
|
||||
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)
|
||||
{
|
||||
/* Initial size of the buffer to be used. Will be doubled each time an
|
||||
overflow occurs. */
|
||||
@ -56,7 +54,7 @@ _IO_vasprintf (char **result_ptr, const char *format, va_list args)
|
||||
sf._sbf._f._flags &= ~_IO_USER_BUF;
|
||||
sf._s._allocate_buffer_unused = (_IO_alloc_type) malloc;
|
||||
sf._s._free_buffer_unused = (_IO_free_type) free;
|
||||
ret = _IO_vfprintf (&sf._sbf._f, format, args);
|
||||
ret = __vfprintf_internal (&sf._sbf._f, format, args, mode_flags);
|
||||
if (ret < 0)
|
||||
{
|
||||
free (sf._sbf._f._IO_buf_base);
|
||||
@ -85,4 +83,10 @@ _IO_vasprintf (char **result_ptr, const char *format, va_list args)
|
||||
(*result_ptr)[needed - 1] = '\0';
|
||||
return ret;
|
||||
}
|
||||
ldbl_weak_alias (_IO_vasprintf, vasprintf)
|
||||
|
||||
int
|
||||
__vasprintf (char **result_ptr, const char *format, va_list args)
|
||||
{
|
||||
return __vasprintf_internal (result_ptr, format, args, 0);
|
||||
}
|
||||
ldbl_weak_alias (__vasprintf, vasprintf)
|
||||
|
Reference in New Issue
Block a user