mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
9964a14579
This patch mechanically removes all remaining uses, and the definitions, of the following libio name aliases: name replaced with ---- ------------- _IO_FILE FILE _IO_fpos_t __fpos_t _IO_fpos64_t __fpos64_t _IO_size_t size_t _IO_ssize_t ssize_t or __ssize_t _IO_off_t off_t _IO_off64_t off64_t _IO_pid_t pid_t _IO_uid_t uid_t _IO_wint_t wint_t _IO_va_list va_list or __gnuc_va_list _IO_BUFSIZ BUFSIZ _IO_cookie_io_functions_t cookie_io_functions_t __io_read_fn cookie_read_function_t __io_write_fn cookie_write_function_t __io_seek_fn cookie_seek_function_t __io_close_fn cookie_close_function_t I used __fpos_t and __fpos64_t instead of fpos_t and fpos64_t because the definitions of fpos_t and fpos64_t depend on the largefile mode. I used __ssize_t and __gnuc_va_list in a handful of headers where namespace cleanliness might be relevant even though they're internal-use-only. In all other cases, I used the public-namespace name. There are a tiny handful of places where I left a use of 'struct _IO_FILE' alone, because it was being used together with 'struct _IO_FILE_plus' or 'struct _IO_FILE_complete' in the same arithmetic expression. Because this patch was almost entirely done with search and replace, I may have introduced indentation botches. I did proofread the diff, but I may have missed something. The ChangeLog below calls out all of the places where this was not a pure search-and-replace change. Installed stripped libraries and executables are unchanged by this patch, except that some assertions in vfscanf.c change line numbers. * libio/libio.h (_IO_FILE): Delete; all uses changed to FILE. (_IO_fpos_t): Delete; all uses changed to __fpos_t. (_IO_fpos64_t): Delete; all uses changed to __fpos64_t. (_IO_size_t): Delete; all uses changed to size_t. (_IO_ssize_t): Delete; all uses changed to ssize_t or __ssize_t. (_IO_off_t): Delete; all uses changed to off_t. (_IO_off64_t): Delete; all uses changed to off64_t. (_IO_pid_t): Delete; all uses changed to pid_t. (_IO_uid_t): Delete; all uses changed to uid_t. (_IO_wint_t): Delete; all uses changed to wint_t. (_IO_va_list): Delete; all uses changed to va_list or __gnuc_va_list. (_IO_BUFSIZ): Delete; all uses changed to BUFSIZ. (_IO_cookie_io_functions_t): Delete; all uses changed to cookie_io_functions_t. (__io_read_fn): Delete; all uses changed to cookie_read_function_t. (__io_write_fn): Delete; all uses changed to cookie_write_function_t. (__io_seek_fn): Delete; all uses changed to cookie_seek_function_t. (__io_close_fn): Delete: all uses changed to cookie_close_function_t. * libio/iofopncook.c: Remove unnecessary forward declarations. * libio/iolibio.h: Correct outdated commentary. * malloc/malloc.c (__malloc_stats): Remove unnecessary casts. * stdio-common/fxprintf.c (__fxprintf_nocancel): Remove unnecessary casts. * stdio-common/getline.c: Use _IO_getdelim directly. Don't redefine ssize_t. * stdio-common/printf_fp.c, stdio_common/printf_fphex.c * stdio-common/printf_size.c: Don't redefine size_t or FILE. Remove outdated comments. * stdio-common/vfscanf.c: Don't redefine va_list.
189 lines
5.2 KiB
C
189 lines
5.2 KiB
C
/* Print output of stream to given obstack.
|
|
Copyright (C) 1996-2018 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
|
|
#include <stdlib.h>
|
|
#include "libioP.h"
|
|
#include "strfile.h"
|
|
#include <assert.h>
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
#include <obstack.h>
|
|
#include <stdarg.h>
|
|
#include <stdio_ext.h>
|
|
|
|
|
|
struct _IO_obstack_file
|
|
{
|
|
struct _IO_FILE_plus file;
|
|
struct obstack *obstack;
|
|
};
|
|
|
|
|
|
static int
|
|
_IO_obstack_overflow (FILE *fp, int c)
|
|
{
|
|
struct obstack *obstack = ((struct _IO_obstack_file *) fp)->obstack;
|
|
int size;
|
|
|
|
/* Make room for another character. This might as well allocate a
|
|
new chunk a memory and moves the old contents over. */
|
|
assert (c != EOF);
|
|
obstack_1grow (obstack, c);
|
|
|
|
/* Setup the buffer pointers again. */
|
|
fp->_IO_write_base = obstack_base (obstack);
|
|
fp->_IO_write_ptr = obstack_next_free (obstack);
|
|
size = obstack_room (obstack);
|
|
fp->_IO_write_end = fp->_IO_write_ptr + size;
|
|
/* Now allocate the rest of the current chunk. */
|
|
obstack_blank_fast (obstack, size);
|
|
|
|
return c;
|
|
}
|
|
|
|
|
|
static size_t
|
|
_IO_obstack_xsputn (FILE *fp, const void *data, size_t n)
|
|
{
|
|
struct obstack *obstack = ((struct _IO_obstack_file *) fp)->obstack;
|
|
|
|
if (fp->_IO_write_ptr + n > fp->_IO_write_end)
|
|
{
|
|
int size;
|
|
|
|
/* We need some more memory. First shrink the buffer to the
|
|
space we really currently need. */
|
|
obstack_blank_fast (obstack, fp->_IO_write_ptr - fp->_IO_write_end);
|
|
|
|
/* Now grow for N bytes, and put the data there. */
|
|
obstack_grow (obstack, data, n);
|
|
|
|
/* Setup the buffer pointers again. */
|
|
fp->_IO_write_base = obstack_base (obstack);
|
|
fp->_IO_write_ptr = obstack_next_free (obstack);
|
|
size = obstack_room (obstack);
|
|
fp->_IO_write_end = fp->_IO_write_ptr + size;
|
|
/* Now allocate the rest of the current chunk. */
|
|
obstack_blank_fast (obstack, size);
|
|
}
|
|
else
|
|
fp->_IO_write_ptr = __mempcpy (fp->_IO_write_ptr, data, n);
|
|
|
|
return n;
|
|
}
|
|
|
|
|
|
/* the jump table. */
|
|
const struct _IO_jump_t _IO_obstack_jumps libio_vtable attribute_hidden =
|
|
{
|
|
JUMP_INIT_DUMMY,
|
|
JUMP_INIT(finish, NULL),
|
|
JUMP_INIT(overflow, _IO_obstack_overflow),
|
|
JUMP_INIT(underflow, NULL),
|
|
JUMP_INIT(uflow, NULL),
|
|
JUMP_INIT(pbackfail, NULL),
|
|
JUMP_INIT(xsputn, _IO_obstack_xsputn),
|
|
JUMP_INIT(xsgetn, NULL),
|
|
JUMP_INIT(seekoff, NULL),
|
|
JUMP_INIT(seekpos, NULL),
|
|
JUMP_INIT(setbuf, NULL),
|
|
JUMP_INIT(sync, NULL),
|
|
JUMP_INIT(doallocate, NULL),
|
|
JUMP_INIT(read, NULL),
|
|
JUMP_INIT(write, NULL),
|
|
JUMP_INIT(seek, NULL),
|
|
JUMP_INIT(close, NULL),
|
|
JUMP_INIT(stat, NULL),
|
|
JUMP_INIT(showmanyc, NULL),
|
|
JUMP_INIT(imbue, NULL)
|
|
};
|
|
|
|
|
|
int
|
|
_IO_obstack_vprintf (struct obstack *obstack, const char *format, va_list args)
|
|
{
|
|
struct obstack_FILE
|
|
{
|
|
struct _IO_obstack_file ofile;
|
|
} new_f;
|
|
int result;
|
|
int size;
|
|
int room;
|
|
|
|
#ifdef _IO_MTSAFE_IO
|
|
new_f.ofile.file.file._lock = NULL;
|
|
#endif
|
|
|
|
_IO_no_init (&new_f.ofile.file.file, _IO_USER_LOCK, -1, NULL, NULL);
|
|
_IO_JUMPS (&new_f.ofile.file) = &_IO_obstack_jumps;
|
|
room = obstack_room (obstack);
|
|
size = obstack_object_size (obstack) + room;
|
|
if (size == 0)
|
|
{
|
|
/* We have to handle the allocation a bit different since the
|
|
`_IO_str_init_static' function would handle a size of zero
|
|
different from what we expect. */
|
|
|
|
/* Get more memory. */
|
|
obstack_make_room (obstack, 64);
|
|
|
|
/* Recompute how much room we have. */
|
|
room = obstack_room (obstack);
|
|
size = room;
|
|
|
|
assert (size != 0);
|
|
}
|
|
|
|
_IO_str_init_static_internal ((struct _IO_strfile_ *) &new_f.ofile,
|
|
obstack_base (obstack),
|
|
size, obstack_next_free (obstack));
|
|
/* Now allocate the rest of the current chunk. */
|
|
assert (size == (new_f.ofile.file.file._IO_write_end
|
|
- new_f.ofile.file.file._IO_write_base));
|
|
assert (new_f.ofile.file.file._IO_write_ptr
|
|
== (new_f.ofile.file.file._IO_write_base
|
|
+ obstack_object_size (obstack)));
|
|
obstack_blank_fast (obstack, room);
|
|
|
|
new_f.ofile.obstack = obstack;
|
|
|
|
result = _IO_vfprintf (&new_f.ofile.file.file, format, args);
|
|
|
|
/* Shrink the buffer to the space we really currently need. */
|
|
obstack_blank_fast (obstack, (new_f.ofile.file.file._IO_write_ptr
|
|
- new_f.ofile.file.file._IO_write_end));
|
|
|
|
return result;
|
|
}
|
|
ldbl_weak_alias (_IO_obstack_vprintf, obstack_vprintf)
|
|
|
|
|
|
int
|
|
_IO_obstack_printf (struct obstack *obstack, const char *format, ...)
|
|
{
|
|
int result;
|
|
va_list ap;
|
|
va_start (ap, format);
|
|
result = _IO_obstack_vprintf (obstack, format, ap);
|
|
va_end (ap);
|
|
return result;
|
|
}
|
|
ldbl_weak_alias (_IO_obstack_printf, obstack_printf)
|