9dd346ff43
This mostly automatically-generated patch converts 113 function definitions in glibc from old-style K&R to prototype-style. Following my other recent such patches, this one deals with the case of function definitions in files that either contain assertions or where grep suggested they might contain assertions - and thus where it isn't possible to use a simple object code comparison as a sanity check on the correctness of the patch, because line numbers are changed. A few such automatically-generated changes needed to be supplemented by manual changes for the result to compile. openat64 had a prototype declaration with "..." but an old-style definition in sysdeps/unix/sysv/linux/dl-openat64.c, and "..." needed adding to the generated prototype in the definition (I've filed <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68024> for diagnosing such cases in GCC; the old state was undefined behavior not requiring a diagnostic, but one seems a good idea). In addition, as Florian has noted regparm attribute mismatches between declaration and definition are only diagnosed for prototype definitions, and five functions needed internal_function added to their definitions (in the case of __pthread_mutex_cond_lock, via the macro definition of __pthread_mutex_lock) to compile on i386. After this patch is in, remaining old-style definitions are probably most readily fixed manually before we can turn on -Wold-style-definition for all builds. Tested for x86_64 and x86 (testsuite). * crypt/md5-crypt.c (__md5_crypt_r): Convert to prototype-style function definition. * crypt/sha256-crypt.c (__sha256_crypt_r): Likewise. * crypt/sha512-crypt.c (__sha512_crypt_r): Likewise. * debug/backtracesyms.c (__backtrace_symbols): Likewise. * elf/dl-minimal.c (_itoa): Likewise. * hurd/hurdmalloc.c (malloc): Likewise. (free): Likewise. (realloc): Likewise. * inet/inet6_option.c (inet6_option_space): Likewise. (inet6_option_init): Likewise. (inet6_option_append): Likewise. (inet6_option_alloc): Likewise. (inet6_option_next): Likewise. (inet6_option_find): Likewise. * io/ftw.c (FTW_NAME): Likewise. (NFTW_NAME): Likewise. (NFTW_NEW_NAME): Likewise. (NFTW_OLD_NAME): Likewise. * libio/iofwide.c (_IO_fwide): Likewise. * libio/strops.c (_IO_str_init_static_internal): Likewise. (_IO_str_init_static): Likewise. (_IO_str_init_readonly): Likewise. (_IO_str_overflow): Likewise. (_IO_str_underflow): Likewise. (_IO_str_count): Likewise. (_IO_str_seekoff): Likewise. (_IO_str_pbackfail): Likewise. (_IO_str_finish): Likewise. * libio/wstrops.c (_IO_wstr_init_static): Likewise. (_IO_wstr_overflow): Likewise. (_IO_wstr_underflow): Likewise. (_IO_wstr_count): Likewise. (_IO_wstr_seekoff): Likewise. (_IO_wstr_pbackfail): Likewise. (_IO_wstr_finish): Likewise. * locale/programs/localedef.c (normalize_codeset): Likewise. * locale/programs/locarchive.c (add_locale_to_archive): Likewise. (add_locales_to_archive): Likewise. (delete_locales_from_archive): Likewise. * malloc/malloc.c (__libc_mallinfo): Likewise. * math/gen-auto-libm-tests.c (init_fp_formats): Likewise. * misc/tsearch.c (__tfind): Likewise. * nptl/pthread_attr_destroy.c (__pthread_attr_destroy): Likewise. * nptl/pthread_attr_getdetachstate.c (__pthread_attr_getdetachstate): Likewise. * nptl/pthread_attr_getguardsize.c (pthread_attr_getguardsize): Likewise. * nptl/pthread_attr_getinheritsched.c (__pthread_attr_getinheritsched): Likewise. * nptl/pthread_attr_getschedparam.c (__pthread_attr_getschedparam): Likewise. * nptl/pthread_attr_getschedpolicy.c (__pthread_attr_getschedpolicy): Likewise. * nptl/pthread_attr_getscope.c (__pthread_attr_getscope): Likewise. * nptl/pthread_attr_getstack.c (__pthread_attr_getstack): Likewise. * nptl/pthread_attr_getstackaddr.c (__pthread_attr_getstackaddr): Likewise. * nptl/pthread_attr_getstacksize.c (__pthread_attr_getstacksize): Likewise. * nptl/pthread_attr_init.c (__pthread_attr_init_2_1): Likewise. (__pthread_attr_init_2_0): Likewise. * nptl/pthread_attr_setdetachstate.c (__pthread_attr_setdetachstate): Likewise. * nptl/pthread_attr_setguardsize.c (pthread_attr_setguardsize): Likewise. * nptl/pthread_attr_setinheritsched.c (__pthread_attr_setinheritsched): Likewise. * nptl/pthread_attr_setschedparam.c (__pthread_attr_setschedparam): Likewise. * nptl/pthread_attr_setschedpolicy.c (__pthread_attr_setschedpolicy): Likewise. * nptl/pthread_attr_setscope.c (__pthread_attr_setscope): Likewise. * nptl/pthread_attr_setstack.c (__pthread_attr_setstack): Likewise. * nptl/pthread_attr_setstackaddr.c (__pthread_attr_setstackaddr): Likewise. * nptl/pthread_attr_setstacksize.c (__pthread_attr_setstacksize): Likewise. * nptl/pthread_condattr_setclock.c (pthread_condattr_setclock): Likewise. * nptl/pthread_create.c (__find_in_stack_list): Likewise. * nptl/pthread_getattr_np.c (pthread_getattr_np): Likewise. * nptl/pthread_mutex_cond_lock.c (__pthread_mutex_lock): Define to use internal_function. * nptl/pthread_mutex_init.c (__pthread_mutex_init): Convert to prototype-style function definition. * nptl/pthread_mutex_lock.c (__pthread_mutex_lock): Likewise. (__pthread_mutex_cond_lock_adjust): Likewise. Use internal_function. * nptl/pthread_mutex_timedlock.c (pthread_mutex_timedlock): Convert to prototype-style function definition. * nptl/pthread_mutex_trylock.c (__pthread_mutex_trylock): Likewise. * nptl/pthread_mutex_unlock.c (__pthread_mutex_unlock_usercnt): Likewise. (__pthread_mutex_unlock): Likewise. * nptl_db/td_ta_clear_event.c (td_ta_clear_event): Likewise. * nptl_db/td_ta_set_event.c (td_ta_set_event): Likewise. * nptl_db/td_thr_clear_event.c (td_thr_clear_event): Likewise. * nptl_db/td_thr_event_enable.c (td_thr_event_enable): Likewise. * nptl_db/td_thr_set_event.c (td_thr_set_event): Likewise. * nss/makedb.c (process_input): Likewise. * posix/fnmatch.c (__strchrnul): Likewise. (__wcschrnul): Likewise. (fnmatch): Likewise. * posix/fnmatch_loop.c (FCT): Likewise. * posix/glob.c (globfree): Likewise. (__glob_pattern_type): Likewise. (__glob_pattern_p): Likewise. * posix/regcomp.c (re_compile_pattern): Likewise. (re_set_syntax): Likewise. (re_compile_fastmap): Likewise. (regcomp): Likewise. (regerror): Likewise. (regfree): Likewise. * posix/regexec.c (regexec): Likewise. (re_match): Likewise. (re_search): Likewise. (re_match_2): Likewise. (re_search_2): Likewise. (re_search_stub): Likewise. Use internal_function (re_copy_regs): Likewise. (re_set_registers): Convert to prototype-style function definition. (prune_impossible_nodes): Likewise. Use internal_function. * resolv/inet_net_pton.c (inet_net_pton): Convert to prototype-style function definition. (inet_net_pton_ipv4): Likewise. * stdlib/strtod_l.c (____STRTOF_INTERNAL): Likewise. * sysdeps/pthread/aio_cancel.c (aio_cancel): Likewise. * sysdeps/pthread/aio_suspend.c (aio_suspend): Likewise. * sysdeps/pthread/timer_delete.c (timer_delete): Likewise. * sysdeps/unix/sysv/linux/dl-openat64.c (openat64): Likewise. Make variadic. * time/strptime_l.c (localtime_r): Convert to prototype-style function definition. * wcsmbs/mbsnrtowcs.c (__mbsnrtowcs): Likewise. * wcsmbs/mbsrtowcs_l.c (__mbsrtowcs_l): Likewise. * wcsmbs/wcsnrtombs.c (__wcsnrtombs): Likewise. * wcsmbs/wcsrtombs.c (__wcsrtombs): Likewise.
349 lines
9.7 KiB
C
349 lines
9.7 KiB
C
/* Copyright (C) 1993-2015 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
|
|
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/>.
|
|
|
|
As a special exception, if you link the code in this file with
|
|
files compiled with a GNU compiler to produce an executable,
|
|
that does not cause the resulting executable to be covered by
|
|
the GNU Lesser General Public License. This exception does not
|
|
however invalidate any other reasons why the executable file
|
|
might be covered by the GNU Lesser General Public License.
|
|
This exception applies to code released by its copyright holders
|
|
in files containing the exception. */
|
|
|
|
#include <assert.h>
|
|
#include "strfile.h"
|
|
#include "libioP.h"
|
|
#include <string.h>
|
|
#include <stdio_ext.h>
|
|
|
|
void
|
|
_IO_str_init_static_internal (_IO_strfile *sf, char *ptr, _IO_size_t size,
|
|
char *pstart)
|
|
{
|
|
_IO_FILE *fp = &sf->_sbf._f;
|
|
char *end;
|
|
|
|
if (size == 0)
|
|
end = __rawmemchr (ptr, '\0');
|
|
else if ((_IO_size_t) ptr + size > (_IO_size_t) ptr)
|
|
end = ptr + size;
|
|
else
|
|
end = (char *) -1;
|
|
_IO_setb (fp, ptr, end, 0);
|
|
|
|
fp->_IO_write_base = ptr;
|
|
fp->_IO_read_base = ptr;
|
|
fp->_IO_read_ptr = ptr;
|
|
if (pstart)
|
|
{
|
|
fp->_IO_write_ptr = pstart;
|
|
fp->_IO_write_end = end;
|
|
fp->_IO_read_end = pstart;
|
|
}
|
|
else
|
|
{
|
|
fp->_IO_write_ptr = ptr;
|
|
fp->_IO_write_end = ptr;
|
|
fp->_IO_read_end = end;
|
|
}
|
|
/* A null _allocate_buffer function flags the strfile as being static. */
|
|
sf->_s._allocate_buffer = (_IO_alloc_type) 0;
|
|
}
|
|
|
|
void
|
|
_IO_str_init_static (_IO_strfile *sf, char *ptr, int size, char *pstart)
|
|
{
|
|
return _IO_str_init_static_internal (sf, ptr, size < 0 ? -1 : size, pstart);
|
|
}
|
|
|
|
void
|
|
_IO_str_init_readonly (_IO_strfile *sf, const char *ptr, int size)
|
|
{
|
|
_IO_str_init_static_internal (sf, (char *) ptr, size < 0 ? -1 : size, NULL);
|
|
sf->_sbf._f._IO_file_flags |= _IO_NO_WRITES;
|
|
}
|
|
|
|
int
|
|
_IO_str_overflow (_IO_FILE *fp, int c)
|
|
{
|
|
int flush_only = c == EOF;
|
|
_IO_size_t pos;
|
|
if (fp->_flags & _IO_NO_WRITES)
|
|
return flush_only ? 0 : EOF;
|
|
if ((fp->_flags & _IO_TIED_PUT_GET) && !(fp->_flags & _IO_CURRENTLY_PUTTING))
|
|
{
|
|
fp->_flags |= _IO_CURRENTLY_PUTTING;
|
|
fp->_IO_write_ptr = fp->_IO_read_ptr;
|
|
fp->_IO_read_ptr = fp->_IO_read_end;
|
|
}
|
|
pos = fp->_IO_write_ptr - fp->_IO_write_base;
|
|
if (pos >= (_IO_size_t) (_IO_blen (fp) + flush_only))
|
|
{
|
|
if (fp->_flags & _IO_USER_BUF) /* not allowed to enlarge */
|
|
return EOF;
|
|
else
|
|
{
|
|
char *new_buf;
|
|
char *old_buf = fp->_IO_buf_base;
|
|
size_t old_blen = _IO_blen (fp);
|
|
_IO_size_t new_size = 2 * old_blen + 100;
|
|
if (new_size < old_blen)
|
|
return EOF;
|
|
new_buf
|
|
= (char *) (*((_IO_strfile *) fp)->_s._allocate_buffer) (new_size);
|
|
if (new_buf == NULL)
|
|
{
|
|
/* __ferror(fp) = 1; */
|
|
return EOF;
|
|
}
|
|
if (old_buf)
|
|
{
|
|
memcpy (new_buf, old_buf, old_blen);
|
|
(*((_IO_strfile *) fp)->_s._free_buffer) (old_buf);
|
|
/* Make sure _IO_setb won't try to delete _IO_buf_base. */
|
|
fp->_IO_buf_base = NULL;
|
|
}
|
|
memset (new_buf + old_blen, '\0', new_size - old_blen);
|
|
|
|
_IO_setb (fp, new_buf, new_buf + new_size, 1);
|
|
fp->_IO_read_base = new_buf + (fp->_IO_read_base - old_buf);
|
|
fp->_IO_read_ptr = new_buf + (fp->_IO_read_ptr - old_buf);
|
|
fp->_IO_read_end = new_buf + (fp->_IO_read_end - old_buf);
|
|
fp->_IO_write_ptr = new_buf + (fp->_IO_write_ptr - old_buf);
|
|
|
|
fp->_IO_write_base = new_buf;
|
|
fp->_IO_write_end = fp->_IO_buf_end;
|
|
}
|
|
}
|
|
|
|
if (!flush_only)
|
|
*fp->_IO_write_ptr++ = (unsigned char) c;
|
|
if (fp->_IO_write_ptr > fp->_IO_read_end)
|
|
fp->_IO_read_end = fp->_IO_write_ptr;
|
|
return c;
|
|
}
|
|
libc_hidden_def (_IO_str_overflow)
|
|
|
|
int
|
|
_IO_str_underflow (_IO_FILE *fp)
|
|
{
|
|
if (fp->_IO_write_ptr > fp->_IO_read_end)
|
|
fp->_IO_read_end = fp->_IO_write_ptr;
|
|
if ((fp->_flags & _IO_TIED_PUT_GET) && (fp->_flags & _IO_CURRENTLY_PUTTING))
|
|
{
|
|
fp->_flags &= ~_IO_CURRENTLY_PUTTING;
|
|
fp->_IO_read_ptr = fp->_IO_write_ptr;
|
|
fp->_IO_write_ptr = fp->_IO_write_end;
|
|
}
|
|
if (fp->_IO_read_ptr < fp->_IO_read_end)
|
|
return *((unsigned char *) fp->_IO_read_ptr);
|
|
else
|
|
return EOF;
|
|
}
|
|
libc_hidden_def (_IO_str_underflow)
|
|
|
|
/* The size of the valid part of the buffer. */
|
|
|
|
_IO_ssize_t
|
|
_IO_str_count (_IO_FILE *fp)
|
|
{
|
|
return ((fp->_IO_write_ptr > fp->_IO_read_end
|
|
? fp->_IO_write_ptr : fp->_IO_read_end)
|
|
- fp->_IO_read_base);
|
|
}
|
|
|
|
|
|
static int
|
|
enlarge_userbuf (_IO_FILE *fp, _IO_off64_t offset, int reading)
|
|
{
|
|
if ((_IO_ssize_t) offset <= _IO_blen (fp))
|
|
return 0;
|
|
|
|
_IO_ssize_t oldend = fp->_IO_write_end - fp->_IO_write_base;
|
|
|
|
/* Try to enlarge the buffer. */
|
|
if (fp->_flags & _IO_USER_BUF)
|
|
/* User-provided buffer. */
|
|
return 1;
|
|
|
|
_IO_size_t newsize = offset + 100;
|
|
char *oldbuf = fp->_IO_buf_base;
|
|
char *newbuf
|
|
= (char *) (*((_IO_strfile *) fp)->_s._allocate_buffer) (newsize);
|
|
if (newbuf == NULL)
|
|
return 1;
|
|
|
|
if (oldbuf != NULL)
|
|
{
|
|
memcpy (newbuf, oldbuf, _IO_blen (fp));
|
|
(*((_IO_strfile *) fp)->_s._free_buffer) (oldbuf);
|
|
/* Make sure _IO_setb won't try to delete
|
|
_IO_buf_base. */
|
|
fp->_IO_buf_base = NULL;
|
|
}
|
|
|
|
_IO_setb (fp, newbuf, newbuf + newsize, 1);
|
|
|
|
if (reading)
|
|
{
|
|
fp->_IO_write_base = newbuf + (fp->_IO_write_base - oldbuf);
|
|
fp->_IO_write_ptr = newbuf + (fp->_IO_write_ptr - oldbuf);
|
|
fp->_IO_write_end = newbuf + (fp->_IO_write_end - oldbuf);
|
|
fp->_IO_read_ptr = newbuf + (fp->_IO_read_ptr - oldbuf);
|
|
|
|
fp->_IO_read_base = newbuf;
|
|
fp->_IO_read_end = fp->_IO_buf_end;
|
|
}
|
|
else
|
|
{
|
|
fp->_IO_read_base = newbuf + (fp->_IO_read_base - oldbuf);
|
|
fp->_IO_read_ptr = newbuf + (fp->_IO_read_ptr - oldbuf);
|
|
fp->_IO_read_end = newbuf + (fp->_IO_read_end - oldbuf);
|
|
fp->_IO_write_ptr = newbuf + (fp->_IO_write_ptr - oldbuf);
|
|
|
|
fp->_IO_write_base = newbuf;
|
|
fp->_IO_write_end = fp->_IO_buf_end;
|
|
}
|
|
|
|
/* Clear the area between the last write position and th
|
|
new position. */
|
|
assert (offset >= oldend);
|
|
if (reading)
|
|
memset (fp->_IO_read_base + oldend, '\0', offset - oldend);
|
|
else
|
|
memset (fp->_IO_write_base + oldend, '\0', offset - oldend);
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
_IO_off64_t
|
|
_IO_str_seekoff (_IO_FILE *fp, _IO_off64_t offset, int dir, int mode)
|
|
{
|
|
_IO_off64_t new_pos;
|
|
|
|
if (mode == 0 && (fp->_flags & _IO_TIED_PUT_GET))
|
|
mode = (fp->_flags & _IO_CURRENTLY_PUTTING ? _IOS_OUTPUT : _IOS_INPUT);
|
|
|
|
if (mode == 0)
|
|
{
|
|
/* Don't move any pointers. But there is no clear indication what
|
|
mode FP is in. Let's guess. */
|
|
if (fp->_IO_file_flags & _IO_NO_WRITES)
|
|
new_pos = fp->_IO_read_ptr - fp->_IO_read_base;
|
|
else
|
|
new_pos = fp->_IO_write_ptr - fp->_IO_write_base;
|
|
}
|
|
else
|
|
{
|
|
_IO_ssize_t cur_size = _IO_str_count(fp);
|
|
new_pos = EOF;
|
|
|
|
/* Move the get pointer, if requested. */
|
|
if (mode & _IOS_INPUT)
|
|
{
|
|
switch (dir)
|
|
{
|
|
case _IO_seek_end:
|
|
offset += cur_size;
|
|
break;
|
|
case _IO_seek_cur:
|
|
offset += fp->_IO_read_ptr - fp->_IO_read_base;
|
|
break;
|
|
default: /* case _IO_seek_set: */
|
|
break;
|
|
}
|
|
if (offset < 0)
|
|
return EOF;
|
|
if ((_IO_ssize_t) offset > cur_size
|
|
&& enlarge_userbuf (fp, offset, 1) != 0)
|
|
return EOF;
|
|
fp->_IO_read_ptr = fp->_IO_read_base + offset;
|
|
fp->_IO_read_end = fp->_IO_read_base + cur_size;
|
|
new_pos = offset;
|
|
}
|
|
|
|
/* Move the put pointer, if requested. */
|
|
if (mode & _IOS_OUTPUT)
|
|
{
|
|
switch (dir)
|
|
{
|
|
case _IO_seek_end:
|
|
offset += cur_size;
|
|
break;
|
|
case _IO_seek_cur:
|
|
offset += fp->_IO_write_ptr - fp->_IO_write_base;
|
|
break;
|
|
default: /* case _IO_seek_set: */
|
|
break;
|
|
}
|
|
if (offset < 0)
|
|
return EOF;
|
|
if ((_IO_ssize_t) offset > cur_size
|
|
&& enlarge_userbuf (fp, offset, 0) != 0)
|
|
return EOF;
|
|
fp->_IO_write_ptr = fp->_IO_write_base + offset;
|
|
new_pos = offset;
|
|
}
|
|
}
|
|
return new_pos;
|
|
}
|
|
libc_hidden_def (_IO_str_seekoff)
|
|
|
|
int
|
|
_IO_str_pbackfail (_IO_FILE *fp, int c)
|
|
{
|
|
if ((fp->_flags & _IO_NO_WRITES) && c != EOF)
|
|
return EOF;
|
|
return _IO_default_pbackfail (fp, c);
|
|
}
|
|
libc_hidden_def (_IO_str_pbackfail)
|
|
|
|
void
|
|
_IO_str_finish (_IO_FILE *fp, int dummy)
|
|
{
|
|
if (fp->_IO_buf_base && !(fp->_flags & _IO_USER_BUF))
|
|
(((_IO_strfile *) fp)->_s._free_buffer) (fp->_IO_buf_base);
|
|
fp->_IO_buf_base = NULL;
|
|
|
|
_IO_default_finish (fp, 0);
|
|
}
|
|
|
|
const struct _IO_jump_t _IO_str_jumps =
|
|
{
|
|
JUMP_INIT_DUMMY,
|
|
JUMP_INIT(finish, _IO_str_finish),
|
|
JUMP_INIT(overflow, _IO_str_overflow),
|
|
JUMP_INIT(underflow, _IO_str_underflow),
|
|
JUMP_INIT(uflow, _IO_default_uflow),
|
|
JUMP_INIT(pbackfail, _IO_str_pbackfail),
|
|
JUMP_INIT(xsputn, _IO_default_xsputn),
|
|
JUMP_INIT(xsgetn, _IO_default_xsgetn),
|
|
JUMP_INIT(seekoff, _IO_str_seekoff),
|
|
JUMP_INIT(seekpos, _IO_default_seekpos),
|
|
JUMP_INIT(setbuf, _IO_default_setbuf),
|
|
JUMP_INIT(sync, _IO_default_sync),
|
|
JUMP_INIT(doallocate, _IO_default_doallocate),
|
|
JUMP_INIT(read, _IO_default_read),
|
|
JUMP_INIT(write, _IO_default_write),
|
|
JUMP_INIT(seek, _IO_default_seek),
|
|
JUMP_INIT(close, _IO_default_close),
|
|
JUMP_INIT(stat, _IO_default_stat),
|
|
JUMP_INIT(showmanyc, _IO_default_showmanyc),
|
|
JUMP_INIT(imbue, _IO_default_imbue)
|
|
};
|