diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:23:01 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:23:01 +0000 |
| commit | 519f6620457d9f84d0125c0c7d01abebaae8efaa (patch) | |
| tree | 28e2b20214b72aa7a633a5910dba7d2388620a78 /libio/vasprintf.c | |
| parent | 74f331b3ccf81cf9404be03e62bde9efcc0878c2 (diff) | |
| parent | 68e2fa8ed9dbf0edfdaed0310801e764c12af46e (diff) | |
Merge commit 'refs/top-bases/t/libc_cleanup' into t/libc_cleanup
Diffstat (limited to 'libio/vasprintf.c')
| -rw-r--r-- | libio/vasprintf.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libio/vasprintf.c b/libio/vasprintf.c index 7460f1efe1..6c35d2b108 100644 --- a/libio/vasprintf.c +++ b/libio/vasprintf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-2016 Free Software Foundation, Inc. +/* Copyright (C) 1995-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -32,16 +32,16 @@ #include "strfile.h" int -_IO_vasprintf (char **result_ptr, const char *format, _IO_va_list args) +_IO_vasprintf (char **result_ptr, const char *format, va_list args) { /* Initial size of the buffer to be used. Will be doubled each time an overflow occurs. */ - const _IO_size_t init_string_size = 100; + const size_t init_string_size = 100; char *string; _IO_strfile sf; int ret; - _IO_size_t needed; - _IO_size_t allocated; + size_t needed; + size_t allocated; /* No need to clear the memory here (unlike for open_memstream) since we know we will never seek on the stream. */ string = (char *) malloc (init_string_size); @@ -54,8 +54,8 @@ _IO_vasprintf (char **result_ptr, const char *format, _IO_va_list args) _IO_JUMPS (&sf._sbf) = &_IO_str_jumps; _IO_str_init_static_internal (&sf, string, init_string_size, string); sf._sbf._f._flags &= ~_IO_USER_BUF; - sf._s._allocate_buffer = (_IO_alloc_type) malloc; - sf._s._free_buffer = (_IO_free_type) free; + 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); if (ret < 0) { |